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

Commit 7772fc84 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 am: c0e0892a

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



Change-Id: I351a3a385c5d1be27258343db342910c5ec0291f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0b9b5f2 c0e0892a

init/init.cpp

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

    }



    SelinuxSetupKernelLogging();

    PropertyInit();



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



    // Now set up SELinux for second stage.

    SelinuxSetupKernelLogging();

    SelabelInitialize();

    SelinuxRestoreContext();