From e21ab7eab46d1c99e0e3e3506edaca096f796e2d Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Tue, 18 Dec 2018 15:00:25 -0800 Subject: Add IncidentCompanionService It is a helper in the system process that helps dumpstate and incidentd get user confirmation to share reports Bug: 123543706 Test: bit GooglePermissionControllerTest:* Change-Id: Ia3fe4bd5257044ed89fe56ce683876fa03ba6c36 --- services/java/com/android/server/SystemServer.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'services/java/com') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 586136802619..793818ca38a4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -91,6 +91,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; @@ -1856,6 +1857,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(); -- cgit v1.2.3-59-g8ed1b