catch nested StrongBoxUnavailableException

GrapheneOS · May 12, 2019 · f340d6952772b1ad493513d62320eb161c819ef9 · f340d69
1 parent b3d4b44
commit f340d6952772b1ad493513d62320eb161c819ef9
Unified Split

Showing with 6 additions and 1 deletion.

+6 −1 app/src/main/java/app/attestation/auditor/SubmitSampleJob.java
diff --git a/app/src/main/java/app/attestation/auditor/SubmitSampleJob.java b/app/src/main/java/app/attestation/auditor/SubmitSampleJob.java
@@ -104,7 +104,12 @@ protected Boolean doInBackground(final Void... params) {
                         AttestationProtocol.generateKeyPair(KEY_ALGORITHM_EC, builder.build());
                         strongBoxCerts = keyStore.getCertificateChain(KEYSTORE_ALIAS_SAMPLE);
                         keyStore.deleteEntry(KEYSTORE_ALIAS_SAMPLE);
-                    } catch (final StrongBoxUnavailableException ignored) {}
+                    } catch (final StrongBoxUnavailableException ignored) {
+                    } catch (final IOException e) {
+                        if (!(e.getCause() instanceof StrongBoxUnavailableException)) {
+                            throw e;
+                        }
+                    }
                 }
 
                 final Process process = new ProcessBuilder("getprop").start();