From 0e5b3f13963b6ba92f52251749bba76ab1cafcc8 Mon Sep 17 00:00:00 2001
From: Eva Bertels <evabertels@google.com>
Date: Thu, 23 Aug 2018 18:34:06 +0100
Subject: [PATCH] Add check for misprovisioned Pixel devices.

Some Pixel devices had a wrong brand value provisioned into keymaster.
Due to this misprovisioning those devices fail device ID attestation because it includes a check for the correct brand value.
This is now solved by re-trying Device ID attestation if we are running on a potentially misprovisioned device, allowing for the known incorrect brand value.

Bug: 69471841
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Change-Id: I41b51a355e1b582fd7c7f12f8b7e0992294b16e3
Merged-In: I73dd4501416bcc2587d137d8b1e27127e3bfc0c0
---
 overlay/frameworks/base/core/res/res/values/config.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 5f42508a..8294e6f1 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -341,4 +341,9 @@
     <!-- Colon separated list of package names that should be granted DND access -->
     <string name="config_defaultDndAccessPackages" translatable="false">com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence</string>
 
+    <!-- Specify model in case of attestation failure due to misprovisioned device. -->
+    <string name="config_misprovisionedDeviceModel" translatable="false">Pixel 2</string>
+
+    <!-- Brand value for attestation of misprovisioned device. -->
+    <string name="config_misprovisionedBrandValue" translatable="false">htc</string>
 </resources>