summaryrefslogtreecommitdiff
path: root/services/java/com
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2018-07-21 23:00:40 -0700
committer Wale Ogunwale <ogunwale@google.com> 2018-07-23 16:37:46 -0700
commit6d50dcc8afb3b32d0c1c6f4ebf930faa3354ac78 (patch)
tree148547b798147d66267fdbb4addde0d99fa7f036 /services/java/com
parent4ec6b12578832c30499073e677755327a08609c6 (diff)
Moved URI grants code out of ActivityManagerService to its own service (13/n)
Allows for other services like window manager to call uri grants without holding AM service lock. Bug: 80414790 Test: Existing tests pass. Change-Id: Ie5b4ddb19a2cedff09332dbeb56bcd9292fd18ac
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/SystemServer.java6
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 85de5810bbae..2e5a1f8eae88 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -118,6 +118,7 @@ import com.android.server.trust.TrustManagerService;
import com.android.server.tv.TvInputManagerService;
import com.android.server.tv.TvRemoteService;
import com.android.server.twilight.TwilightService;
+import com.android.server.uri.UriGrantsManagerService;
import com.android.server.usage.UsageStatsService;
import com.android.server.vr.VrManagerService;
import com.android.server.webkit.WebViewUpdateService;
@@ -562,6 +563,11 @@ public final class SystemServer {
mSystemServiceManager.startService(DeviceIdentifiersPolicyService.class);
traceEnd();
+ // Uri Grants Manager.
+ traceBeginAndSlog("UriGrantsManagerService");
+ mSystemServiceManager.startService(UriGrantsManagerService.Lifecycle.class);
+ traceEnd();
+
// Activity manager runs the show.
traceBeginAndSlog("StartActivityManager");
// TODO: Might need to move after migration to WM.