diff options
| author | 2019-01-29 19:34:40 +0000 | |
|---|---|---|
| committer | 2019-01-29 19:34:40 +0000 | |
| commit | 917955a4e669c9b237db621359ed67117758605a (patch) | |
| tree | 2a7bb4adc7767442dc2ba136a654019c3b03111f /services/java/com | |
| parent | afe6ec4b271890b3ea943c1208acd6282642ee9b (diff) | |
| parent | e21ab7eab46d1c99e0e3e3506edaca096f796e2d (diff) | |
Merge changes from topic "bug and incident report approval"
* changes:
Add IncidentCompanionService
Added a new "incidentReportApprover" permission protection flag.
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 80552d88a49d..e378dd67bc1f 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -92,6 +92,7 @@ import com.android.server.display.DisplayManagerService; import com.android.server.dreams.DreamManagerService; import com.android.server.emergency.EmergencyAffordanceService; import com.android.server.hdmi.HdmiControlService; +import com.android.server.incident.IncidentCompanionService; import com.android.server.input.InputManagerService; import com.android.server.inputmethod.InputMethodManagerService; import com.android.server.inputmethod.MultiClientInputMethodManagerService; @@ -1857,6 +1858,11 @@ public final class SystemServer { mSystemServiceManager.startService(StatsCompanionService.Lifecycle.class); traceEnd(); + // Incidentd and dumpstated helper + traceBeginAndSlog("StartIncidentCompanionService"); + mSystemServiceManager.startService(IncidentCompanionService.class); + traceEnd(); + if (safeMode) { traceBeginAndSlog("EnterSafeModeAndDisableJitCompilation"); mActivityManagerService.enterSafeMode(); |