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

am: 966e5e3ff5 Change-Id: I8c5cecdce716f0de68deedca7557486e6b95635a
2019-06-29 20:24:38 -07:00
parent 7bed31955b 966e5e3ff5
commit edc01a3510
1 changed files with 4 additions and 0 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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);