diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-04 09:23:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-04 09:23:05 +0000 |
| commit | eeb8f87d1533c8b4176777ab9fe08de531d2de57 (patch) | |
| tree | ba2a91c680d97fb3261f02d4d26d72fa1bb4918b /init/builtins.cpp | |
| parent | ebbc3881972796088b8cff71f860219fbfbd45b0 (diff) | |
| parent | 95b77d1f24d4f6fc54993cec5157d7bc1b32498d (diff) | |
Merge "Change ownership of apex data directories to root." am: 931257683d am: 95b77d1f24
Change-Id: I8e42fc117c757e0e8bc0ec34033f93d77e39eba6
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 64d9c5907..2a6df84f1 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 @@ static Result<void> create_apex_data_dirs() { 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 {}; |