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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538989 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f17f052e551c14ccdfcdb193f2648f779548999
2021-01-06 20:16:48 +00:00
parent f88fbe5128 deb3fc814c
commit 97ad203382
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: