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

Commit 32dd630e authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Don't re-wrap DeviceIdAttestationExceptions" am: 27bc799e am:... 

Merge "Don't re-wrap DeviceIdAttestationExceptions" am: 27bc799e am: 02359c00 am: 85d779c4 am: 7ac158fd

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

Change-Id: Icb492007c93663a16a8ade8107b29625cb766c9c
parents 3027a5d5 7ac158fd

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

+5 −0
Original line number Diff line number Diff line
@@ -260,6 +260,11 @@ public abstract class AttestationUtils { 
        } catch (SecurityException e) {

            throw e;

        } catch (Exception e) {

            // If a DeviceIdAttestationException was previously wrapped with some other type,

            // let's throw the original exception instead of wrapping it yet again.

            if (e.getCause() instanceof DeviceIdAttestationException) {

                throw (DeviceIdAttestationException) e.getCause();

            }

            throw new DeviceIdAttestationException("Unable to perform attestation", e);

        }

    }