Merge "Keystore 2.0: Fix wrong exception returned on not authenticated." am: 89ec9d42d9 am: 70f3932f23

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538989 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0e521aa1402dabfe6be5818d1203a703067ce29
2021-01-06 19:54:53 +00:00
parent f5c637719f 70f3932f23
commit deb3fc814c
1 changed files with 1 additions and 0 deletions
--- a/keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java
+++ b/keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java
@@ -120,6 +120,7 @@ abstract class KeyStoreCryptoOperationUtils {
                return new KeyPermanentlyInvalidatedException();
            case ResponseCode.LOCKED:
            case ResponseCode.UNINITIALIZED:
+            case KeymasterDefs.KM_ERROR_KEY_USER_NOT_AUTHENTICATED:
                // TODO b/173111727 remove response codes LOCKED and UNINITIALIZED
                return new UserNotAuthenticatedException();
            default: