Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80e87f97 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Fix AddAccountSettings memory leak" am: 104501fa 

am: c17b4e5a

Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
parents c26e534b c17b4e5a

core/java/android/accounts/AbstractAccountAuthenticator.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/accounts/AccountManager.java

+4 −0
Original line number Diff line number Diff line
@@ -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