Defend KeyChainActivity again callback exceptions.

Also remove some unnecessary throws in the KeyChainService

Change-Id: I1779229957a2e700effca33e15cea2e71e73b281

2 files changed, 9 insertions, 6 deletions

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 @@ public class KeyChainActivity extends ListActivity {
         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();
diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 3b3d144..b02dfac 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -191,13 +191,13 @@ public class KeyChainService extends Service {
                                            String accountType,
                                            String authTokenType,
                                            String[] requiredFeatures,
-                                           Bundle options) throws NetworkErrorException {
+                                           Bundle options) {
             return null;
         }
 
         @Override public Bundle confirmCredentials(AccountAuthenticatorResponse response,
                                                    Account account,
-                                                   Bundle options) throws NetworkErrorException {
+                                                   Bundle options) {
             return null;
         }
 
@@ -207,7 +207,7 @@ public class KeyChainService extends Service {
         @Override public Bundle getAuthToken(AccountAuthenticatorResponse response,
                                              Account account,
                                              String authTokenType,
-                                             Bundle options) throws NetworkErrorException {
+                                             Bundle options) {
             byte[] bytes = new byte[AUTHTOKEN_LENGTH];
             mSecureRandom.nextBytes(bytes);
             String authToken = Base64.encode(bytes, Charsets.US_ASCII);
@@ -227,13 +227,13 @@ public class KeyChainService extends Service {
         @Override public Bundle updateCredentials(AccountAuthenticatorResponse response,
                                                   Account account,
                                                   String authTokenType,
-                                                  Bundle options) throws NetworkErrorException {
+                                                  Bundle options) {
             return null;
         }
 
         @Override public Bundle hasFeatures(AccountAuthenticatorResponse response,
                                             Account account,
-                                            String[] features) throws NetworkErrorException {
+                                            String[] features) {
             return null;
         }
     };