commit af74368a364ce68385065370f7be0c51fb23bece
author Alex Hong <rurumihong@google.com> Wed Jun 08 05:37:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 08 05:37:22 2022 +0000
tree b8968854444ba62207e1921a0fac10689e181cee
parent 7e25d3e8fa587a7adbc86ae2ffb9d40a6cfe509a
parent 8c224faa24039853028c3d9c0e1eadc5ef7bd935

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

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();