summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2019-07-12 00:02:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-12 00:02:23 +0000
commitb90ef30b8251b3625c628af5864a7cc236f6fb94 (patch)
tree223ff086777cbf33de1707dd400a298c9d179b32
parent6990af63ff06297ffa0373daa32a196c29d99b95 (diff)
parent8b6bff42b8cf7f8596278f3b34652deb3c7cdde2 (diff)
downloadnative-b90ef30b8251b3625c628af5864a7cc236f6fb94.tar.gz
Merge "installd: Check for support before migrating obb" into qt-dev
-rw-r--r--cmds/installd/migrate_legacy_obb_data.sh8
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