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

2023-07-21 20:47:47 +00:00
parent c3199051ac 166e569b7a
commit e7627bd732
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4854,7 +4854,6 @@ public class AccountManagerService
            if (accountType == null) throw new IllegalArgumentException("accountType is null");
            mAccounts = accounts;
            mStripAuthTokenFromResult = stripAuthTokenFromResult;
-            mResponse = response;
            mAccountType = accountType;
            mExpectActivityLaunch = expectActivityLaunch;
            mCreationTime = SystemClock.elapsedRealtime();
@@ -4868,8 +4867,8 @@ public class AccountManagerService
            if (response != null) {
                try {
                    response.asBinder().linkToDeath(this, 0 /* flags */);
+                    mResponse = response;
                } catch (RemoteException e) {
-                    mResponse = null;
                    binderDied();
                }
            }