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

Merge "Toast: Fix the concurrency problem of mAuthenticator" am: a8438682f7 am: adfda7919a

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

Change-Id: I6c380882f5629bf4c8e61fdee74ff64a6de1ed1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitry Dementyev
2022-11-07 20:15:21 +00:00
committed by Automerger Merge Worker
parent cf8bc7b89d adfda7919a
commit 087b916562
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -4795,6 +4795,7 @@ public class AccountManagerService
private abstract class Session extends IAccountAuthenticatorResponse.Stub private abstract class Session extends IAccountAuthenticatorResponse.Stub
implements IBinder.DeathRecipient, ServiceConnection { implements IBinder.DeathRecipient, ServiceConnection {
private final Object mSessionLock = new Object();
IAccountManagerResponse mResponse; IAccountManagerResponse mResponse;
final String mAccountType; final String mAccountType;
final boolean mExpectActivityLaunch; final boolean mExpectActivityLaunch;
@@ -4985,9 +4986,11 @@ public class AccountManagerService
} }
private void unbind() { private void unbind() {
if (mAuthenticator != null) { synchronized (mSessionLock) {
mAuthenticator = null; if (mAuthenticator != null) {
mContext.unbindService(this); mAuthenticator = null;
mContext.unbindService(this);
}
} }
} }
@@ -4997,12 +5000,14 @@ public class AccountManagerService
@Override @Override
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
mAuthenticator = IAccountAuthenticator.Stub.asInterface(service); synchronized (mSessionLock) {
try { mAuthenticator = IAccountAuthenticator.Stub.asInterface(service);
run(); try {
} catch (RemoteException e) { run();
onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION, } catch (RemoteException e) {
"remote exception"); onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,
"remote exception");
}
} }
} }