summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-03-22 21:57:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-22 21:57:42 +0000
commitc56709a2c41d7acc6e0517dc124e0811c4f8da45 (patch)
tree6aa393236ab965d283d4d4a9659fe4ef6bfa7270
parentb24ba9d52fb81d4343d0b93c7d2c9ec7f239dbd1 (diff)
parent8875f872de445d7c52a290266303fad3803f1c01 (diff)
Merge "Keystore: Fix Device ID attestation test."
-rw-r--r--keystore/java/android/security/keystore/AttestationUtils.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java
index 11c36893d984..1eb854187b32 100644
--- a/keystore/java/android/security/keystore/AttestationUtils.java
+++ b/keystore/java/android/security/keystore/AttestationUtils.java
@@ -287,6 +287,8 @@ public abstract class AttestationUtils {
keyStore.deleteEntry(keystoreAlias);
return certificateChain;
+ } catch (SecurityException e) {
+ throw e;
} catch (Exception e) {
throw new DeviceIdAttestationException("Unable to perform attestation", e);
}