Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ed810a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Keystore: Fix Device ID attestation test." am: c56709a2 am: 738d6b3b am: e3409f7a am: 860c3a8e

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

Change-Id: I08b224fdb2d3bc54bcf8b646cfec81a44915a68f
parents 6ae98075 860c3a8e

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

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,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);

        }