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

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

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



Change-Id: I7707d1117482e54b2c0c92526bcbaa62f9fcd109
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73b40b58 7772fc84

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