diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2017-09-19 18:42:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-19 18:42:07 +0000 |
| commit | c17b4e5a1439fa2af7b168408b601b7da3cc9699 (patch) | |
| tree | b22b23e8b7e3aebfcaae02bf14ad85b93687115f /core/java/android | |
| parent | 8b2e42102564b3ce989251b5dc3021207dd186da (diff) | |
| parent | 104501fa293276412131f02692c4a5f301cb9a57 (diff) | |
Merge "Fix AddAccountSettings memory leak"
am: 104501fa29
Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
Diffstat (limited to 'core/java/android')
| -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 |