diff options
| author | 2022-12-05 18:52:53 +0000 | |
|---|---|---|
| committer | 2022-12-05 18:52:53 +0000 | |
| commit | ecbadfbfe40c024ec0d3bae3a5d8d42423f1c5d1 (patch) | |
| tree | 40fdc0fd6475f1dba72e26247023e591ff1fcdfe /keystore/java | |
| parent | e3b11beae838c70de8d80fea36e10917902f4403 (diff) | |
| parent | 250413b0ea617415df6e2192e0500c7e39842a70 (diff) | |
Merge "ID attestation: Pass second IMEIs to Keystore" am: bfbf069ee5 am: 19b6eea501 am: 250413b0ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277393
Change-Id: I15b612f0701a2e35474df1a5d0e2061656929224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java index acc0005154b4..afec8304716f 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -52,6 +52,7 @@ import android.system.keystore2.KeyEntryResponse; import android.system.keystore2.KeyMetadata; import android.system.keystore2.ResponseCode; import android.telephony.TelephonyManager; +import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; @@ -856,6 +857,13 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato KeymasterDefs.KM_TAG_ATTESTATION_ID_IMEI, imei.getBytes(StandardCharsets.UTF_8) )); + final String secondImei = telephonyService.getImei(1); + if (!TextUtils.isEmpty(secondImei)) { + params.add(KeyStore2ParameterUtils.makeBytes( + KeymasterDefs.KM_TAG_ATTESTATION_ID_SECOND_IMEI, + secondImei.getBytes(StandardCharsets.UTF_8) + )); + } break; } case AttestationUtils.ID_TYPE_MEID: { |