| commit | 5d1b24d3c8d0a87d08a4db72079bd8b69f4e2542 | [log] [tgz] |
|---|---|---|
| author | Patrick Baumann <patb@google.com> | Sat Jun 29 20:08:47 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jun 29 20:08:47 2019 -0700 |
| tree | a92468d882dd0f253459520254c5a5a0acc0a52f | |
| parent | a0aa088c9f47ba31979f71df2dfc3ac38293ffda [diff] | |
| parent | cfa47f618357af0c17cbb8be06d9b4f326ff9ee1 [diff] |
Merge "Call ActivityManagerService.enterSafeMode" into qt-dev am: cfa47f6183 Change-Id: I0b94ebc55cebba026b3fc2db4d479af1cf6169e6
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6dd8527..3a7cbf8 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java
@@ -1884,6 +1884,10 @@ mSystemServiceManager.startService(IncidentCompanionService.class); traceEnd(); + if (safeMode) { + mActivityManagerService.enterSafeMode(); + } + // MMS service broker traceBeginAndSlog("StartMmsService"); mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);