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

am: 65290a9333

Change-Id: I9f649a6b663ca79cab1aa9b9e62a94455f974435

1 files changed, 4 insertions, 0 deletions

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 3ec8b2efa8a2..47539d3adcb8 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1893,6 +1893,10 @@ public final class SystemServer {
         mSystemServiceManager.startService(IncidentCompanionService.class);
         t.traceEnd();
 
+        if (safeMode) {
+            mActivityManagerService.enterSafeMode();
+        }
+
         // MMS service broker
         t.traceBegin("StartMmsService");
         mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);