diff options
| author | Daniel Rosenberg <drosen@google.com> | 2019-07-09 19:12:56 -0700 |
|---|---|---|
| committer | Daniel Rosenberg <drosen@google.com> | 2019-07-09 19:28:34 -0700 |
| commit | 8b6bff42b8cf7f8596278f3b34652deb3c7cdde2 (patch) | |
| tree | 907d1e95f856b8e0f89cd778223186c1d2a7375f | |
| parent | feb6af0eaf391e16c95bf45273f2d37bebdadc43 (diff) | |
| download | native-8b6bff42b8cf7f8596278f3b34652deb3c7cdde2.tar.gz | |
installd: Check for support before migrating obb
This prevents migrating the obb folder if the device's kernel does not
support the new location.
Test: Run script on kernel with support for the unshared_obb option, and
without, i.e. P kernel and Q kernel
Bug: 136199978
Change-Id: I3ff3e7653d9c9c6cdda4d17bafc853b5602597cf
| -rw-r--r-- | cmds/installd/migrate_legacy_obb_data.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmds/installd/migrate_legacy_obb_data.sh b/cmds/installd/migrate_legacy_obb_data.sh index 4f8a1ecb56..ef9be5c1a8 100644 --- a/cmds/installd/migrate_legacy_obb_data.sh +++ b/cmds/installd/migrate_legacy_obb_data.sh @@ -20,6 +20,14 @@ if ! test -d /data/media/obb ; then exit 0 fi +rm -rf /data/media/0/Android/obb/test_probe +touch /sdcard/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/0/Android/obb/test_probe + exit 0 +fi + log -p i -t migrate_legacy_obb_data "Migrating legacy obb data." rm -rf /data/media/0/Android/obb cp -F -p -R -P -d /data/media/obb /data/media/0/Android |