commit 17eca61449f5849e3997858c6f1ad1ad2065eb2d
author Samiul Islam <samiul@google.com> Mon Mar 07 15:24:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 07 15:24:11 2022 +0000
tree 9c1787f4a63d3f2dacb783e8ef6a8109f8d0975f
parent b64324750207da0fa151a486defb79c6dbe37d09
parent a6f36ae8d0c73e347a13fd54200af171d6ae0794

Create root directory for supplemental data during user creation am: a6f36ae8d0

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

Change-Id: Ie7c16c5562932432818ac138abbfce9aa4cb90a6

vold_prepare_subdirs.cpp

diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 0d58e4d..0fe8b01 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -172,8 +172,13 @@
             return false;
         }
 
+        auto misc_de_path = android::vold::BuildDataMiscDePath(user_id);
+        if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM,
+                                  misc_de_path + "/supplemental", user_id)) {
+            return false;
+        }
+
         if (volume_uuid.empty()) {
-            auto misc_de_path = android::vold::BuildDataMiscDePath(user_id);
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_de_path + "/vold")) return false;
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_de_path + "/storaged")) return false;
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_de_path + "/rollback")) return false;
@@ -203,8 +208,13 @@
             return false;
         }
 
+        auto misc_ce_path = android::vold::BuildDataMiscCePath(user_id);
+        if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM,
+                                  misc_ce_path + "/supplemental", user_id)) {
+            return false;
+        }
+
         if (volume_uuid.empty()) {
-            auto misc_ce_path = android::vold::BuildDataMiscCePath(user_id);
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/vold")) return false;
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/storaged")) return false;
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/rollback")) return false;