Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88426c10 authored by Eva Bertels's avatar Eva Bertels Committed by Android (Google) Code Review
Browse files

Merge "Minor changes to check for misprovisioned Pixel 2 devices"

parents a0c97e29 f1bbe75e

keystore/java/android/security/keystore/AttestationUtils.java

+5 −4
Original line number Diff line number Diff line
@@ -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,12 +129,12 @@ 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);

    }