commit 219306f683743e87927b88f6ae9431bf8f3020bf
author Alex Hong <rurumihong@google.com> Wed Jun 08 05:53:21 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 08 05:53:21 2022 +0000
tree b8968854444ba62207e1921a0fac10689e181cee
parent 5bfe8317b3fc44a205f7cc717af803f0802ca7dd
parent af74368a364ce68385065370f7be0c51fb23bece

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>

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 4955bc5..7cd7054 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -905,6 +905,7 @@
         UmountDebugRamdisk();
     }
 
+    SelinuxSetupKernelLogging();
     PropertyInit();
 
     // Umount second stage resources after property service has read the .prop files.
@@ -919,7 +920,6 @@
     MountExtraFilesystems();
 
     // Now set up SELinux for second stage.
-    SelinuxSetupKernelLogging();
     SelabelInitialize();
     SelinuxRestoreContext();