diff options
| author | 2024-06-13 15:37:33 +0000 | |
|---|---|---|
| committer | 2024-06-13 15:37:33 +0000 | |
| commit | 936249baab0bc5f587d308ca670f45332b510a7c (patch) | |
| tree | 79ddb82f1fe4d26b0029cb5a7040c3ce00287391 | |
| parent | cf93082309a61edf92ca8304d520a9fefdae3188 (diff) | |
| parent | eac1b8d0cc637baa2e7a10c5d46fc647e8e3c1f8 (diff) | |
Merge "Add support for GET_ATTESTATION_APPLICATION_ID_FAILED error code" into main am: eac1b8d0cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2967383
Change-Id: I1f740691cce53c18e39df2f20511d9f4191eab69
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 804892e84a50..b739c43bb776 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)); |