diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-08 18:14:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-08 18:14:54 +0000 |
| commit | 41069eb17ec603942f6297e0d2e095cc1544ca2c (patch) | |
| tree | 3cdc1aa1d2b74dd636495a78219bd6ed761fbd89 /keystore/java/android | |
| parent | a8cfbe87c04ae01c582a2bd447544a0b2cb9d6cf (diff) | |
| parent | 1a4f20ceac9db52e61786b487757b76db6abbf5a (diff) | |
Merge "Keystore 2.0 SPI: Make getAttestationIds return an empty array." am: 1f82f476c0 am: cf64e636a8 am: 1a4f20ceac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664321
Change-Id: I8c1146a0b86cfca21bf9f3e837b4315cca3d5f86
Diffstat (limited to 'keystore/java/android')
| -rw-r--r-- | keystore/java/android/security/keystore/KeyGenParameterSpec.java | 9 | ||||
| -rw-r--r-- | keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java index 1f9022b4ad3d..a6aa4f21e53b 100644 --- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java +++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java @@ -353,7 +353,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu boolean userPresenceRequired, byte[] attestationChallenge, boolean devicePropertiesAttestationIncluded, - int[] attestationIds, + @NonNull int[] attestationIds, boolean uniqueIdIncluded, boolean userAuthenticationValidWhileOnBody, boolean invalidatedByBiometricEnrollment, @@ -779,9 +779,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu * @return integer array representing the requested device IDs to attest. */ @SystemApi - @Nullable - public int[] getAttestationIds() { - return Utils.cloneIfNotNull(mAttestationIds); + public @NonNull int[] getAttestationIds() { + return mAttestationIds.clone(); } /** @@ -911,7 +910,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu private boolean mUserPresenceRequired = false; private byte[] mAttestationChallenge = null; private boolean mDevicePropertiesAttestationIncluded = false; - private int[] mAttestationIds = null; + private int[] mAttestationIds = new int[0]; private boolean mUniqueIdIncluded = false; private boolean mUserAuthenticationValidWhileOnBody; private boolean mInvalidatedByBiometricEnrollment = true; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java index c26d9f583fd4..dc7f3dda35c0 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -655,7 +655,7 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato } int[] idTypes = mSpec.getAttestationIds(); - if (idTypes == null) { + if (idTypes.length == 0) { return; } final Set<Integer> idTypesSet = new ArraySet<>(idTypes.length); |