diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-17 01:20:36 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-17 01:20:36 +0000 |
commit | 7b5c277ded84c0ad6bff51419dfa4814bd7187c5 (patch) | |
tree | a4aba2290d8a52de586db95596d397650959a682 | |
parent | acaf4e606ff35cc6bcc99c1bb54699f1c456edf5 (diff) | |
parent | 9072109773b62cdb89613d78534252164dfe760f (diff) | |
download | native-7b5c277ded84c0ad6bff51419dfa4814bd7187c5.tar.gz |
Snap for 10338099 from 9072109773b62cdb89613d78534252164dfe760f to udc-release
Change-Id: Ib6ffe19372b4934bcd8681b5aec8af1de1018307
-rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 2 | ||||
-rw-r--r-- | cmds/installd/otapreopt_chroot.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 5dbf7ac715..8a337569c4 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -3586,7 +3586,7 @@ Dumpstate::RunStatus Dumpstate::ParseCommandlineAndRun(int argc, char* argv[]) { // an app; they are irrelevant here because bugreport is triggered via command line. // Update Last ID before calling Run(). Initialize(); - status = Run(-1 /* calling_uid */, "" /* calling_package */); + status = Run(0 /* calling_uid */, "" /* calling_package */); } return status; } diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp index 1b7acabf70..c86993cb06 100644 --- a/cmds/installd/otapreopt_chroot.cpp +++ b/cmds/installd/otapreopt_chroot.cpp @@ -165,7 +165,8 @@ static int otapreopt_chroot(const int argc, char **arg) { // Bind mount necessary directories. constexpr const char* kBindMounts[] = { - "/data", "/dev", "/proc", "/sys" + "/data", "/dev", "/proc", "/sys", + "/sys/fs/selinux" /* Required for apexd which includes libselinux */ }; for (size_t i = 0; i < arraysize(kBindMounts); ++i) { std::string trg = StringPrintf("/postinstall%s", kBindMounts[i]); |