Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6b952d8b08ba2d26fe43c26317a1d71bbb84b4ad
This commit is contained in:
Treehugger Robot
2021-03-22 22:39:53 +00:00
committed by Automerger Merge Worker
parent 2d45d999be c56709a2c4
commit 738d6b3be4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystore/java/android/security/keystore/AttestationUtils.java
View File

@@ -287,6 +287,8 @@ public abstract class AttestationUtils {
keyStore.deleteEntry(keystoreAlias); keyStore.deleteEntry(keystoreAlias);
return certificateChain; return certificateChain;
} catch (SecurityException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new DeviceIdAttestationException("Unable to perform attestation", e); throw new DeviceIdAttestationException("Unable to perform attestation", e);
} }