Skip to content

Commit 38b971d

Browse files
committed
drop obsolete workaround for 6th gen Pixels
6th gen Pixels initially didn't declare support for the attest key feature despite shipping support for it. This is no longer relevant since the minimum supported OS version has been raised so it's not possible to encounter the issue anymore.
1 parent 92a3045 commit 38b971d

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

app/src/main/java/app/attestation/auditor/AttestationProtocol.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,6 @@ boolean hasPogoPins() {
289289
"Pixel 9a",
290290
"Pixel 10").contains(Build.MODEL);
291291

292-
// Pixel 6, Pixel 6 Pro and Pixel 6a forgot to declare the attest key feature when it shipped in Android 12
293-
private static final boolean alwaysHasAttestKey = ImmutableSet.of(
294-
"Pixel 6",
295-
"Pixel 6 Pro",
296-
"Pixel 6a").contains(Build.MODEL);
297-
298292
private static final ImmutableMap<String, DeviceInfo> fingerprintsCustomOS = ImmutableMap
299293
.<String, DeviceInfo>builder()
300294
// GrapheneOS
@@ -1389,7 +1383,7 @@ static AttestationResult generateSerialized(final Context context, final byte[]
13891383
final boolean hasPersistentKey = keyStore.containsAlias(persistentKeystoreAlias);
13901384
final String attestationKeystoreAlias;
13911385
final boolean useStrongBox;
1392-
final boolean canUseAttestKey = (alwaysHasAttestKey || pm.hasSystemFeature(PackageManager.FEATURE_KEYSTORE_APP_ATTEST_KEY));
1386+
final boolean canUseAttestKey = pm.hasSystemFeature(PackageManager.FEATURE_KEYSTORE_APP_ATTEST_KEY);
13931387
final boolean useAttestKey;
13941388
if (hasPersistentKey) {
13951389
final String freshKeyStoreAlias = statePrefix + KEYSTORE_ALIAS_FRESH;

0 commit comments

Comments
 (0)