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

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

Merge "Call ActivityManagerService.enterSafeMode" into qt-dev am: cfa47f61 

am: 966e5e3f

Change-Id: I8c5cecdce716f0de68deedca7557486e6b95635a
parents 7bed3195 966e5e3f

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