summaryrefslogtreecommitdiff
path: root/keystore
diff options
context:
space:
mode:
author Shaquille Johnson <ssjohnson@google.com> 2024-06-13 15:44:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-13 15:44:47 +0000
commit108230a53bd73c98eb5d35261441d9f23a0f1f14 (patch)
tree3ed681ebfe1d99ab2e338c3e06eec2d2ebb275c1 /keystore
parent16783b94c93cb9001536b8019fadcd3d99706692 (diff)
parent936249baab0bc5f587d308ca670f45332b510a7c (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>
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/KeyStoreException.java3
1 files changed, 3 insertions, 0 deletions
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));