ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Set the log callback earlier for showing system property set denials"" am: 526fbe2a37

Browse source 
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>
This commit is contained in:
Kean Mariotti 2022-06-08 09:32:41 +00:00 • committed by Automerger Merge Worker
commit c0e0892a5a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/init.cpp
View file

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