diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/accounts/AbstractAccountAuthenticator.java | 3 | ||||
| -rw-r--r-- | core/java/android/accounts/AccountManager.java | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/accounts/AbstractAccountAuthenticator.java b/core/java/android/accounts/AbstractAccountAuthenticator.java index 87e512c31bfa..7ca65a41f85e 100644 --- a/core/java/android/accounts/AbstractAccountAuthenticator.java +++ b/core/java/android/accounts/AbstractAccountAuthenticator.java @@ -175,6 +175,9 @@ public abstract class AbstractAccountAuthenticator { } if (result != null) { response.onResult(result); + } else { + response.onError(AccountManager.ERROR_CODE_INVALID_RESPONSE, + "null bundle returned"); } } catch (Exception e) { handleException(response, "addAccount", accountType, e); diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index a446296fe393..d22e268dad5b 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -2318,6 +2318,10 @@ public class AccountManager { private class Response extends IAccountManagerResponse.Stub { @Override public void onResult(Bundle bundle) { + if (bundle == null) { + onError(ERROR_CODE_INVALID_RESPONSE, "null bundle returned"); + return; + } Intent intent = bundle.getParcelable(KEY_INTENT); if (intent != null && mActivity != null) { // since the user provided an Activity we will silently start intents |