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

Commit 02359c00 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Iee544cafa0cba275bb151cd99b431af00389ffb6
parents 41cb7914 27bc799e

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

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

        }

    }