Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "bug and incident report approval"

Browse Source 
* changes:
  Add IncidentCompanionService
  Added a new "incidentReportApprover" permission protection flag.
This commit is contained in:
Joe Onorato
2019-01-29 19:34:40 +00:00
committed by Android (Google) Code Review
parent afe6ec4b27 e21ab7eab4
commit 917955a4e6
24 changed files with 1170 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/SystemServer.java
View File

@@ -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();