Merge "Call ActivityManagerService.enterSafeMode" into qt-dev

am: cfa47f6183 Change-Id: I4ce954d8dfd27c07b40ce113654d9922058a96cc
2019-06-29 20:08:47 -07:00
parent a6d9bffb63 cfa47f6183
commit 966e5e3ff5
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);