Merge "Revert "Set the log callback earlier for showing system property set denials"" am: 526fbe2a37
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2118487
Change-Id: I016b315fb5b79b330125a0d1ca746a7430144f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/init/init.cpp b/init/init.cpp
index 7cd7054..4955bc5 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -905,7 +905,6 @@
UmountDebugRamdisk();
}
- SelinuxSetupKernelLogging();
PropertyInit();
// Umount second stage resources after property service has read the .prop files.
@@ -920,6 +919,7 @@
MountExtraFilesystems();
// Now set up SELinux for second stage.
+ SelinuxSetupKernelLogging();
SelabelInitialize();
SelinuxRestoreContext();