Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AddAccountSettings memory leak"

Browse Source 
am: 104501fa29

Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
This commit is contained in:
Fyodor Kupolov
2017-09-19 18:42:07 +00:00
committed by android-build-merger
parent 8b2e421025 104501fa29
commit c17b4e5a14
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/accounts/AbstractAccountAuthenticator.java
View File

@@ -175,6 +175,9 @@ public abstract class AbstractAccountAuthenticator {
} }
if (result != null) { if (result != null) {
response.onResult(result); response.onResult(result);
} else {
response.onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
"null bundle returned");
} }
} catch (Exception e) { } catch (Exception e) {
handleException(response, "addAccount", accountType, e); handleException(response, "addAccount", accountType, e);

4
core/java/android/accounts/AccountManager.java
View File

@@ -2318,6 +2318,10 @@ public class AccountManager {
private class Response extends IAccountManagerResponse.Stub { private class Response extends IAccountManagerResponse.Stub {
@Override @Override
public void onResult(Bundle bundle) { public void onResult(Bundle bundle) {
if (bundle == null) {
onError(ERROR_CODE_INVALID_RESPONSE, "null bundle returned");
return;
}
Intent intent = bundle.getParcelable(KEY_INTENT); Intent intent = bundle.getParcelable(KEY_INTENT);
if (intent != null && mActivity != null) { if (intent != null && mActivity != null) {
// since the user provided an Activity we will silently start intents // since the user provided an Activity we will silently start intents