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

Merge "Allow Intelligence Service app to obtain Clipboard permission."

Browse Source
This commit is contained in:
Felipe Leme
2018-11-15 01:59:24 +00:00
committed by Android (Google) Code Review
parent 4e998f917c 927fbf0f27
commit cb9172a0db
5 changed files with 79 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1136,6 +1136,13 @@ public final class SystemServer {
traceEnd();
}
if (!disableIntelligence) {
traceBeginAndSlog("StartIntelligenceService");
mSystemServiceManager.startService(INTELLIGENCE_MANAGER_SERVICE_CLASS);
traceEnd();
}
// NOTE: ClipboardService indirectly depends on IntelligenceService
traceBeginAndSlog("StartClipboardService");
mSystemServiceManager.startService(ClipboardService.class);
traceEnd();
@@ -1767,12 +1774,6 @@ public final class SystemServer {
traceEnd();
}
if (!disableIntelligence) {
traceBeginAndSlog("StartIntelligenceService");
mSystemServiceManager.startService(INTELLIGENCE_MANAGER_SERVICE_CLASS);
traceEnd();
}
traceBeginAndSlog("AppServiceManager");
mSystemServiceManager.startService(AppBindingService.Lifecycle.class);
traceEnd();