Merge changes from topics "createapexdirs", "createapexrollbackdirs" am: 3e1c0478b9
am: 0ad91e40ea
Change-Id: I63e3a68a9d197c89aa195409c9847d6334f1dd14
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 2fb95d2..3a58b2e 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -155,6 +155,7 @@
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;
// TODO: Return false if this returns false once sure this should succeed.
+ prepare_dir(sehandle, 0700, 0, 0, misc_de_path + "/apexrollback");
prepare_apex_subdirs(sehandle, misc_de_path);
auto vendor_de_path = android::vold::BuildDataVendorDePath(user_id);
@@ -172,6 +173,7 @@
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;
// TODO: Return false if this returns false once sure this should succeed.
+ prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/apexrollback");
prepare_apex_subdirs(sehandle, misc_ce_path);
auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);