commit 8ff1e193acc1d9946f877332547c7706cfcf12f4
author Janis Danisevskis <jdanis@google.com> Fri Jun 03 11:31:55 2016 -0700
committer Janis Danisevskis <jdanis@google.com> Fri Aug 19 13:50:55 2016 +0100
tree 5f41e644138dffa415c31a0524f9a08d9332f7c0
parent da3addda02138e5dfbd8ff42f69b7c3c1d646ba6

Add KeyAttestationApplicationIdProviderService to SystemServer

Add getKeyAttestationApplicationId and the Parcelables
KeyAttestationPackageInfo and KeyAttestationApplicationId,
needed by keystore.

Bug: 22914603
Change-Id: I89a88cd9cd80e9b132ca67fc452e9cae8b8ad241

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 f0cf320..9ebf2b9 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.power.ShutdownThread;
 import com.android.server.restrictions.RestrictionsManagerService;
 import com.android.server.retaildemo.RetailDemoModeService;
+import com.android.server.security.KeyAttestationApplicationIdProviderService;
 import com.android.server.soundtrigger.SoundTriggerService;
 import com.android.server.statusbar.StatusBarManagerService;
 import com.android.server.storage.DeviceStorageMonitorService;
@@ -558,6 +559,11 @@
             Slog.i(TAG, "Reading configuration...");
             SystemConfig.getInstance();
 
+            traceBeginAndSlog("StartKeyAttestationApplicationIdProviderService");
+            ServiceManager.addService("sec_key_att_app_id_provider",
+                    new KeyAttestationApplicationIdProviderService(context));
+            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+
             traceBeginAndSlog("StartSchedulingPolicyService");
             ServiceManager.addService("scheduling_policy", new SchedulingPolicyService());
             Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);