commit 139354905d30dfd39de299247adbf5b7df341781
author Robin Lee <rgl@google.com> Thu Mar 23 15:28:37 2017 +0000
committer Robin Lee <rgl@google.com> Thu Mar 23 15:36:16 2017 +0000
tree 7a59e39b758185419636d0d27c4b202cf8a40337
parent 229ce701279110080dd9e4241637cc72347eb5d8

Forward package removed broadcast to KeyChainService

Test: Cts Verifier > Security > KeyChain Test
Test: Manually uninstall and reinstalling Chrome
Bug: 35968281
Change-Id: I1692f7042f081d1a743e0e64ea24fe1dbe63192d

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0ed56ab..5c58234 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -99,6 +99,7 @@
 import com.android.server.restrictions.RestrictionsManagerService;
 import com.android.server.retaildemo.RetailDemoModeService;
 import com.android.server.security.KeyAttestationApplicationIdProviderService;
+import com.android.server.security.KeyChainSystemService;
 import com.android.server.soundtrigger.SoundTriggerService;
 import com.android.server.statusbar.StatusBarManagerService;
 import com.android.server.storage.DeviceStorageMonitorService;
@@ -727,6 +728,10 @@
                     new KeyAttestationApplicationIdProviderService(context));
             traceEnd();
 
+            traceBeginAndSlog("StartKeyChainSystemService");
+            mSystemServiceManager.startService(KeyChainSystemService.class);
+            traceEnd();
+
             traceBeginAndSlog("StartSchedulingPolicyService");
             ServiceManager.addService("scheduling_policy", new SchedulingPolicyService());
             traceEnd();