Merge "Call ActivityManagerService.enterSafeMode"

2019-07-15 08:39:55 +00:00
parent f4b0318d6f a848a8ec14
commit 97fc7d6bf6
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
@@ -1671,6 +1671,10 @@ public final class SystemServer {
        mSystemServiceManager.startService(StatsCompanionService.Lifecycle.class);
        traceEnd();

+        if (safeMode) {
+            mActivityManagerService.enterSafeMode();
+        }
+
        // MMS service broker
        traceBeginAndSlog("StartMmsService");
        mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);