diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2017-09-19 18:56:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-19 18:56:45 +0000 |
| commit | c9117ddbfa2e46dc0c50fcdb78c8e47a0bb1e95d (patch) | |
| tree | 4ebdb1eadfea45a81677feee8553a0b17cec2aba /core/java/android/accounts/AccountManager.java | |
| parent | dfcd7852a26d307227c714939139f373ac6f9dea (diff) | |
| parent | 80e87f97c34b9e079f56bf2dd276a7accf9446a7 (diff) | |
Merge "Fix AddAccountSettings memory leak" am: 104501fa29 am: c17b4e5a14
am: 80e87f97c3
Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81
Diffstat (limited to 'core/java/android/accounts/AccountManager.java')
| -rw-r--r-- | core/java/android/accounts/AccountManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index dd6ad55fba6d..bd9c9fa30536 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -2321,6 +2321,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 |