diff options
| author | 2019-07-15 13:21:57 -0700 | |
|---|---|---|
| committer | 2019-07-15 13:21:57 -0700 | |
| commit | f8e91dcbbc8a804ef0b11b039e257f7ffb731d2b (patch) | |
| tree | 542ab92faeff585607863120d41828b7278ecfe8 | |
| parent | 3f373c0379b18f872beb9cc0109bec01b9bc58b3 (diff) | |
| parent | a92f294522951ae80e660d0745ca9e8d725ee660 (diff) | |
Merge "installd: Account for empty obb contents on migration" into qt-dev
am: a92f294522
Change-Id: I1433782d0613f743143add8538ec30b248d3c696
| -rw-r--r-- | cmds/installd/migrate_legacy_obb_data.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/cmds/installd/migrate_legacy_obb_data.sh b/cmds/installd/migrate_legacy_obb_data.sh index ef9be5c1a8..10756881be 100644 --- a/cmds/installd/migrate_legacy_obb_data.sh +++ b/cmds/installd/migrate_legacy_obb_data.sh @@ -15,16 +15,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -if ! test -d /data/media/obb ; then - log -p i -t migrate_legacy_obb_data "No legacy obb data to migrate." - exit 0 -fi - -rm -rf /data/media/0/Android/obb/test_probe +rm -rf /sdcard/Android/obb/test_probe +mkdir -p /sdcard/Android/obb/ 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 + rm -rf /sdcard/Android/obb/test_probe + exit 0 +fi + +# Delete the test file, and remove the obb folder if it is empty +rm -rf /sdcard/Android/obb/test_probe +rmdir /data/media/obb + +if ! test -d /data/media/obb ; then + log -p i -t migrate_legacy_obb_data "No legacy obb data to migrate." exit 0 fi |