commit be72c37f6a55ee2e5c994591181103a72e575846
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 04 09:23:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 04 09:23:05 2020 +0000
tree ba2a91c680d97fb3261f02d4d26d72fa1bb4918b
parent 432553b754ecd332e7f676b8a1b725420e1983dc
parent 5050a99f434efe8ae52338cfb913217b3bfaba76

Merge "Change ownership of apex data directories to root." am: 931257683d am: 95b77d1f24

Change-Id: I8e42fc117c757e0e8bc0ec34033f93d77e39eba6

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 64d9c59..2a6df84 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -60,6 +60,7 @@
 #include <fscrypt/fscrypt.h>
 #include <libgsi/libgsi.h>
 #include <logwrap/logwrap.h>
+#include <private/android_filesystem_config.h>
 #include <selinux/android.h>
 #include <selinux/label.h>
 #include <selinux/selinux.h>
@@ -1266,9 +1267,7 @@
         if (strchr(name, '@') != nullptr) continue;
 
         auto path = "/data/misc/apexdata/" + std::string(name);
-        auto system_uid = DecodeUid("system");
-        auto options =
-                MkdirOptions{path, 0700, *system_uid, *system_uid, FscryptAction::kNone, "ref"};
+        auto options = MkdirOptions{path, 0770, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"};
         make_dir_with_options(options);
     }
     return {};