From a1f2ab72b286e5d713e8ceece29403be07dc080c Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Tue, 18 May 2021 15:24:14 +0100
Subject: [PATCH] Add Device ID attestation support gs101

Bug: 187151761
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAddNetworkWithKeychainKey_granted
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegationCertSelection
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testInstallKeyPairLogged
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testGenerateKeyPairLogged
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegatedCertInstallerDirectly
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetKeyGrant
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetKeyPairCertificateLogged
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAddNetworkWithKeychainKey_granted
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testKeyManagement
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testDelegationCertSelection
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testInstallKeyPairLogged
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testGenerateKeyPairLogged
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testDelegatedCertInstallerDirectly
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetKeyGrant
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetKeyPairCertificateLogged
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testAddNetworkWithKeychainKey_granted
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testKeyManagement
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testDelegationCertSelection
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testInstallKeyPairLogged
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testGenerateKeyPairLogged
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testDelegatedCertInstallerDirectly
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testSetKeyGrant
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testSetKeyPairCertificateLogged

Change-Id: I71f8811780cfbc78515c69c1a5170b6451ff7821
---
 device.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/device.mk b/device.mk
index b1274d54..92801d25 100644
--- a/device.mk
+++ b/device.mk
@@ -1172,3 +1172,8 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs101/device_framework
 # Preopt SystemUI
 PRODUCT_DEXPREOPT_SPEED_APPS += \
     SystemUIGoogle
+
+# Keymaster configuration
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
+    frameworks/native/data/etc/android.hardware.device_unique_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.device_unique_attestation.xml