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

Commit 73b40b58 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"... 

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

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



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

init/init.cpp

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

    }



    SelinuxSetupKernelLogging();

    PropertyInit();



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



    // Now set up SELinux for second stage.

    SelinuxSetupKernelLogging();

    SelabelInitialize();

    SelinuxRestoreContext();