commit 89fd2f0d39fe17f92729d41a3c7130d1e1bcaf41
author Annie Meng <anniemeng@google.com> Thu Jan 17 09:26:04 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 17 09:26:04 2019 -0800
tree 24dd18076bde1687888f7f2b45e2beccfdd68267
parent 5b43da67faf5346714c495326f6c3d056556c3bd
parent 2506860cfb260fc0ca918ae94366cb5553db9a31

Merge "Create subdirs in system_ce/ for multi-user backup" am: 625203444b am: 33a5634374
am: 2506860cfb

Change-Id: I116438108a176deb90eaf724ac8ddd66d597a129

vold_prepare_subdirs.cpp

diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 8f67f1e..1dd5e85 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -144,6 +144,15 @@
             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;
+
+            auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);
+            if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, system_ce_path + "/backup")) {
+                return false;
+            }
+            if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM,
+                             system_ce_path + "/backup_stage")) {
+                return false;
+            }
         }
     }
     return true;