diff options
| author | 2024-06-13 15:44:47 +0000 | |
|---|---|---|
| committer | 2024-06-13 15:44:47 +0000 | |
| commit | 108230a53bd73c98eb5d35261441d9f23a0f1f14 (patch) | |
| tree | 3ed681ebfe1d99ab2e338c3e06eec2d2ebb275c1 | |
| parent | 16783b94c93cb9001536b8019fadcd3d99706692 (diff) | |
| parent | 936249baab0bc5f587d308ca670f45332b510a7c (diff) | |
Merge "Add support for GET_ATTESTATION_APPLICATION_ID_FAILED error code" into main am: eac1b8d0cc am: 936249baab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2967383
Change-Id: I802fe461e2c550e6a609d90adc0afc913b11ab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyStoreException.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 2becf0763239..fb1fa3b58f74 100644 --- a/Android.bp +++ b/Android.bp @@ -115,7 +115,7 @@ filegroup { ":android.security.legacykeystore-java-source", ":android.security.maintenance-java-source", ":android.security.metrics-java-source", - ":android.system.keystore2-V3-java-source", + ":android.system.keystore2-V4-java-source", ":android.hardware.cas-V1-java-source", ":credstore_aidl", ":dumpstate_aidl", diff --git a/keystore/java/android/security/KeyStoreException.java b/keystore/java/android/security/KeyStoreException.java index 5825facee021..eea5690dddf1 100644 --- a/keystore/java/android/security/KeyStoreException.java +++ b/keystore/java/android/security/KeyStoreException.java @@ -679,6 +679,9 @@ public class KeyStoreException extends Exception { sErrorCodeToFailureInfo.put(ResponseCode.OUT_OF_KEYS_REQUIRES_SYSTEM_UPGRADE, new PublicErrorInformation(IS_SYSTEM_ERROR | IS_TRANSIENT_ERROR, ERROR_DEVICE_REQUIRES_UPGRADE_FOR_ATTESTATION)); + sErrorCodeToFailureInfo.put(ResponseCode.GET_ATTESTATION_APPLICATION_ID_FAILED, + new PublicErrorInformation(IS_SYSTEM_ERROR | IS_TRANSIENT_ERROR, + ERROR_INTERNAL_SYSTEM_ERROR)); sErrorCodeToFailureInfo.put(ResponseCode.OUT_OF_KEYS_PENDING_INTERNET_CONNECTIVITY, new PublicErrorInformation(IS_SYSTEM_ERROR | IS_TRANSIENT_ERROR, ERROR_ATTESTATION_KEYS_UNAVAILABLE)); |