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

Merge "Fix the concurrency issue when 'linkToDeath' in AccountManagerService that leads to JE" into main

Browse Source
This commit is contained in:
Dmitry Dementyev
2023-07-21 20:47:47 +00:00
committed by Gerrit Code Review
parent c3199051ac 166e569b7a
commit e7627bd732
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4854,7 +4854,6 @@ public class AccountManagerService
if (accountType == null) throw new IllegalArgumentException("accountType is null"); if (accountType == null) throw new IllegalArgumentException("accountType is null");
mAccounts = accounts; mAccounts = accounts;
mStripAuthTokenFromResult = stripAuthTokenFromResult; mStripAuthTokenFromResult = stripAuthTokenFromResult;
mResponse = response;
mAccountType = accountType; mAccountType = accountType;
mExpectActivityLaunch = expectActivityLaunch; mExpectActivityLaunch = expectActivityLaunch;
mCreationTime = SystemClock.elapsedRealtime(); mCreationTime = SystemClock.elapsedRealtime();
@@ -4868,8 +4867,8 @@ public class AccountManagerService
if (response != null) { if (response != null) {
try { try {
response.asBinder().linkToDeath(this, 0 /* flags */); response.asBinder().linkToDeath(this, 0 /* flags */);
mResponse = response;
} catch (RemoteException e) { } catch (RemoteException e) {
mResponse = null;
binderDied(); binderDied();
} }
} }