commit 860c3a8ea3102161f20feeb540f5017915317ba1
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 23 13:57:30 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 23 13:57:30 2021 +0000
tree f7e52dbca616905a09d35332ad57b8c70314db12
parent 5e4093ed3f524bac487e2bc417a0d2c58b02d8c0
parent e3409f7af4a85914945a13f9cc87fdcf1577b51d

Merge "Keystore: Fix Device ID attestation test." am: c56709a2c4 am: 738d6b3be4 am: e3409f7af4

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

Change-Id: I7382cd13ac4cfc99f2b72b7185fa4af8152bedb9

keystore/java/android/security/keystore/AttestationUtils.java

diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java
index cd77d9c..ec3b102 100644
--- a/keystore/java/android/security/keystore/AttestationUtils.java
+++ b/keystore/java/android/security/keystore/AttestationUtils.java
@@ -254,6 +254,8 @@
             keyStore.deleteEntry(keystoreAlias);
 
             return certificateChain;
+        } catch (SecurityException e) {
+            throw e;
         } catch (Exception e) {
             throw new DeviceIdAttestationException("Unable to perform attestation", e);
         }