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

Commit 966e5e3f authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

Merge "Call ActivityManagerService.enterSafeMode" into qt-dev 

am: cfa47f61

Change-Id: I4ce954d8dfd27c07b40ce113654d9922058a96cc
parents a6d9bffb cfa47f61

services/java/com/android/server/SystemServer.java

+4 −0
Original line number Diff line number Diff line
@@ -1884,6 +1884,10 @@ public final class SystemServer { 
        mSystemServiceManager.startService(IncidentCompanionService.class);

        traceEnd();



        if (safeMode) {

            mActivityManagerService.enterSafeMode();

        }



        // MMS service broker

        traceBeginAndSlog("StartMmsService");

        mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);