Merge changes I1bbf480c,Icf2059cc am: 701a99834f am: 16f46cd3d5 am: 17a1295297

Change-Id: I4f0e5b0b7f95a00bf222f31597e1d3c7c5c016c1
This commit is contained in:
Automerger Merge Worker 2020-01-17 18:04:27 +00:00
commit b47c53d83b

View file

@ -121,7 +121,7 @@ static bool rmrf_contents(const std::string& path) {
}
static bool prepare_apex_subdirs(struct selabel_handle* sehandle, const std::string& path) {
if (!prepare_dir(sehandle, 0700, 0, 0, path + "/apexdata")) return false;
if (!prepare_dir(sehandle, 0711, 0, 0, path + "/apexdata")) return false;
auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir("/apex"), closedir);
if (!dirp) {
@ -138,7 +138,7 @@ static bool prepare_apex_subdirs(struct selabel_handle* sehandle, const std::str
if (strchr(name, '@') != NULL) continue;
if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, path + "/apexdata/" + name)) {
if (!prepare_dir(sehandle, 0771, AID_ROOT, AID_SYSTEM, path + "/apexdata/" + name)) {
return false;
}
}