commit f1f587f28a18fa9db8e0613bffb1aafa93f2f216
author rickywai <rickywai@google.com> Tue Jan 19 16:44:52 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 19 16:44:52 2021 +0000
tree a03b0c1f687ea2c6bc2e09517632b66e703c9c07
parent 3b4adee2f05502b80fb9007b4c2545e0140775b0
parent f44cf21080f215dc67e929b85ec8d4c66c4d38b4

Merge "Call setupAppDir before EnsureDirExists" am: d4de02ed14 am: f44cf21080

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ebb973e11e87f4404d13089848b8115bbbee05

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index ac7356c..f97397d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -813,17 +813,18 @@
     }
 
     for (int i = 0; i < size; i++) {
-        auto status = EnsureDirExists(sources_cstr[i], 0771, AID_MEDIA_RW, AID_MEDIA_RW);
-        if (status != OK) {
-            PLOG(ERROR) << "Failed to create dir: " << sources_cstr[i];
-            return false;
-        }
         // Make sure /storage/emulated/... paths are setup correctly
-        status = setupAppDir(targets_cstr[i], uid, false /* fixupExistingOnly */);
+        // This needs to be done before EnsureDirExists to ensure Android/ is created.
+        auto status = setupAppDir(targets_cstr[i], uid, false /* fixupExistingOnly */);
         if (status != OK) {
             PLOG(ERROR) << "Failed to create dir: " << targets_cstr[i];
             return false;
         }
+        status = EnsureDirExists(sources_cstr[i], 0771, AID_MEDIA_RW, AID_MEDIA_RW);
+        if (status != OK) {
+            PLOG(ERROR) << "Failed to create dir: " << sources_cstr[i];
+            return false;
+        }
     }
 
     char android_data_dir[PATH_MAX];