Defend KeyChainActivity again callback exceptions.
Also remove some unnecessary throws in the KeyChainService
Change-Id: I1779229957a2e700effca33e15cea2e71e73b281
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 552a73a..aa60e41 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -143,7 +143,10 @@
if (keyChainAliasResponse != null) {
try {
keyChainAliasResponse.alias(alias);
- } catch (RemoteException ignored) {
+ } catch (Exception ignored) {
+ // don't just catch RemoteException, caller could
+ // throw back a RuntimeException across processes
+ // which we should protect against.
}
}
finish();