Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e0892a authored by Kean Mariotti's avatar Kean Mariotti Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I016b315fb5b79b330125a0d1ca746a7430144f16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 219306f6 526fbe2a

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,6 @@ int SecondStageMain(int argc, char** argv) { 
        UmountDebugRamdisk();

    }



    SelinuxSetupKernelLogging();

    PropertyInit();



    // Umount second stage resources after property service has read the .prop files.
@@ -920,6 +919,7 @@ int SecondStageMain(int argc, char** argv) { 
    MountExtraFilesystems();



    // Now set up SELinux for second stage.

    SelinuxSetupKernelLogging();

    SelabelInitialize();

    SelinuxRestoreContext();