diff options
| author | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
| commit | 220871a697290529278ed16db508eda8e12f3fc7 (patch) | |
| tree | bc13101b63c6fe39a9d92706ecb7ded7f98f5a9c /keystore/java/android/security/KeyStore.java | |
| parent | 802f191b2b84a1b1b82c7f6f3268846084b35dfb (diff) | |
| parent | 98e12851336b7db16e583f9afac63ecc97465980 (diff) | |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index ccf9de0abdb4..7e959a87da5d 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -754,6 +754,8 @@ public class KeyStore { // None of the key's SIDs can ever be authenticated return new KeyPermanentlyInvalidatedException(); } + case UNINITIALIZED: + return new KeyPermanentlyInvalidatedException(); default: return new InvalidKeyException("Keystore operation failed", e); } |