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

Commit 219306f6 authored by Alex Hong's avatar Alex Hong Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1698ef9d4f862497325ef1f96f8b78f732889ea6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bfe8317 af74368a

init/init.cpp

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

    }



    SelinuxSetupKernelLogging();

    PropertyInit();



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



    // Now set up SELinux for second stage.

    SelinuxSetupKernelLogging();

    SelabelInitialize();

    SelinuxRestoreContext();