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

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

Merge "Fix the concurrency issue when 'linkToDeath' in AccountManagerService... 

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

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



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

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

+1 −2
Original line number Diff line number Diff line
@@ -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();

                }

            }