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

Commit 087b9165 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Automerger Merge Worker
Browse files

Merge "Toast: Fix the concurrency problem of mAuthenticator" am: a8438682 am: adfda791 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276161



Change-Id: I6c380882f5629bf4c8e61fdee74ff64a6de1ed1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf8bc7b8 adfda791

services/core/java/com/android/server/accounts/AccountManagerService.java

+14 −9
Original line number Diff line number Diff line
@@ -4795,6 +4795,7 @@ public class AccountManagerService 


    private abstract class Session extends IAccountAuthenticatorResponse.Stub

            implements IBinder.DeathRecipient, ServiceConnection {

        private final Object mSessionLock = new Object();

        IAccountManagerResponse mResponse;

        final String mAccountType;

        final boolean mExpectActivityLaunch;
@@ -4985,11 +4986,13 @@ public class AccountManagerService 
        }



        private void unbind() {

            synchronized (mSessionLock) {

                if (mAuthenticator != null) {

                    mAuthenticator = null;

                    mContext.unbindService(this);

                }

            }

        }



        public void cancelTimeout() {

            mHandler.removeMessages(MESSAGE_TIMED_OUT, this);
@@ -4997,6 +5000,7 @@ public class AccountManagerService 


        @Override

        public void onServiceConnected(ComponentName name, IBinder service) {

            synchronized (mSessionLock) {

                mAuthenticator = IAccountAuthenticator.Stub.asInterface(service);

                try {

                    run();
@@ -5005,6 +5009,7 @@ public class AccountManagerService 
                            "remote exception");

                }

            }

        }



        @Override

        public void onServiceDisconnected(ComponentName name) {