Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback." am: 3cc1866454 am: 2cc1d4e458

am: 142afc926f

Change-Id: Iddeb8e2722162edcd5929a9e9684d3c7fcfcd0ba
This commit is contained in:
Annie Meng 2019-01-17 03:20:35 -08:00 committed by android-build-merger
commit 5b43da67fa

View file

@ -128,6 +128,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
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;
auto vendor_de_path = android::vold::BuildDataVendorDePath(user_id);
if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, vendor_de_path + "/fpdata")) {
@ -142,6 +143,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
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;
}
}
return true;