drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iee544cafa0cba275bb151cd99b431af00389ffb6
This commit is contained in:
Seth Moore
2021-05-07 02:40:27 +00:00
committed by Automerger Merge Worker
parent 41cb7914b8 27bc799e7e
commit 02359c00d6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,11 @@ public abstract class AttestationUtils {
} catch (SecurityException e) { } catch (SecurityException e) {
throw e; throw e;
} catch (Exception 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); throw new DeviceIdAttestationException("Unable to perform attestation", e);
} }
} }