Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 108230a5 authored by Shaquille Johnson's avatar Shaquille Johnson Committed by Automerger Merge Worker
Browse files

Merge "Add support for GET_ATTESTATION_APPLICATION_ID_FAILED error code" into... 

Merge "Add support for GET_ATTESTATION_APPLICATION_ID_FAILED error code" into main am: eac1b8d0 am: 936249ba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2967383



Change-Id: I802fe461e2c550e6a609d90adc0afc913b11ab30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16783b94 936249ba

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

keystore/java/android/security/KeyStoreException.java

+3 −0
Original line number Diff line number Diff line
@@ -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));