Merge "Set the log callback earlier for showing system property set denials" am: af74368a36

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684665

Change-Id: I1698ef9d4f862497325ef1f96f8b78f732889ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Hong 2022-06-08 05:53:21 +00:00 committed by Automerger Merge Worker
commit 219306f683

View file

@ -905,6 +905,7 @@ int SecondStageMain(int argc, char** argv) {
UmountDebugRamdisk();
}
SelinuxSetupKernelLogging();
PropertyInit();
// Umount second stage resources after property service has read the .prop files.
@ -919,7 +920,6 @@ int SecondStageMain(int argc, char** argv) {
MountExtraFilesystems();
// Now set up SELinux for second stage.
SelinuxSetupKernelLogging();
SelabelInitialize();
SelinuxRestoreContext();