summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZim <zezeozue@google.com>2019-11-15 13:00:19 +0000
committerZim <zezeozue@google.com>2019-11-15 13:00:19 +0000
commitcf8269f4ca5ba81575cc5ab90480e20a03dfe415 (patch)
tree584fcb7cb9019374736b14900b63b5ad25fb3cda
parent0d83872951243cc6f3dcd3c65f33b23a1f2c8374 (diff)
downloadnative-cf8269f4ca5ba81575cc5ab90480e20a03dfe415.tar.gz
Fix legacy OBB data migration path
Ib64f7eb7608704e1b53a1b923cc068172fe05e1c botched the legacy OBB data migration path. By doing s/sdcard/data\/media/g instead of s/sdcard/data\/media\/0/g Test: Device boots and /data/media/Android dir is not created Bug: 144547920 Change-Id: I4f43cf1380159da17622512a6ad9d9106bf3143b
-rw-r--r--cmds/installd/migrate_legacy_obb_data.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmds/installd/migrate_legacy_obb_data.sh b/cmds/installd/migrate_legacy_obb_data.sh
index 0e6d7b9c62..7399681c3e 100644
--- a/cmds/installd/migrate_legacy_obb_data.sh
+++ b/cmds/installd/migrate_legacy_obb_data.sh
@@ -15,17 +15,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-rm -rf /data/media/Android/obb/test_probe
-mkdir -p /data/media/Android/obb/
-touch /data/media/Android/obb/test_probe
+rm -rf /data/media/0/Android/obb/test_probe
+mkdir -p /data/media/0/Android/obb/
+touch /data/media/0/Android/obb/test_probe
if ! test -f /data/media/0/Android/obb/test_probe ; then
log -p i -t migrate_legacy_obb_data "No support for 'unshared_obb'. Not migrating"
- rm -rf /data/media/Android/obb/test_probe
+ rm -rf /data/media/0/Android/obb/test_probe
exit 0
fi
# Delete the test file, and remove the obb folder if it is empty
-rm -rf /data/media/Android/obb/test_probe
+rm -rf /data/media/0/Android/obb/test_probe
rmdir /data/media/obb
if ! test -d /data/media/obb ; then