From f1bbe75ede256ffccecbdf9929422dadfe246e60 Mon Sep 17 00:00:00 2001
From: Eva Bertels <evabertels@google.com>
Date: Tue, 28 Aug 2018 15:31:53 +0100
Subject: [PATCH] Minor changes to check for misprovisioned Pixel 2 devices

Check for brand parameter specified in config file. Implementing suggestion that was added to the original CL (ag/4791307) after it was submitted.

Bug: 69471841
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Change-Id: I9b257f406d5b47265db4dbf022df75865f496cdd
---
 .../java/android/security/keystore/AttestationUtils.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java
index 3d2a2718a9c84..bd497c1e4efaf 100644
--- a/keystore/java/android/security/keystore/AttestationUtils.java
+++ b/keystore/java/android/security/keystore/AttestationUtils.java
@@ -29,6 +29,7 @@ import android.security.keymaster.KeymasterArguments;
 import android.security.keymaster.KeymasterCertificateChain;
 import android.security.keymaster.KeymasterDefs;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.ArraySet;
 
 import java.io.ByteArrayInputStream;
@@ -128,14 +129,14 @@ public abstract class AttestationUtils {
     @NonNull public static KeymasterArguments prepareAttestationArgumentsIfMisprovisioned(
             Context context, @NonNull int[] idTypes, @NonNull byte[] attestationChallenge) throws
             DeviceIdAttestationException {
-        if (!isPotentiallyMisprovisionedDevice(context)) {
-            return null;
-        }
         Resources resources = context.getResources();
         String misprovisionedBrand = resources.getString(
                 com.android.internal.R.string.config_misprovisionedBrandValue);
+        if (!TextUtils.isEmpty(misprovisionedBrand) && !isPotentiallyMisprovisionedDevice(context)){
+            return null;
+        }
         return prepareAttestationArguments(
-                    context, idTypes, attestationChallenge, misprovisionedBrand);
+                context, idTypes, attestationChallenge, misprovisionedBrand);
     }
 
     @NonNull private static boolean isPotentiallyMisprovisionedDevice(Context context) {