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

Commit bf01a9d1 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Do not hold locks when calling getAccounts" into oc-dev am: 6a841cb8 

am: b70a2225

Change-Id: I8e4231b1ff62ddff7460f2b731bf1ffe7fca0849
parents f44cb656 b70a2225

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

+5 −11
Original line number Diff line number Diff line
@@ -1597,11 +1597,7 @@ public class AccountManagerService 
                @Override

                public void run() throws RemoteException {

                    // Confirm that the owner's account still exists before this step.

                    UserAccounts owner = getUserAccounts(parentUserId);

                    synchronized (owner.dbLock) {

                        synchronized (owner.cacheLock) {

                            for (Account acc : getAccounts(parentUserId,

                                    mContext.getOpPackageName())) {

                    for (Account acc : getAccounts(parentUserId, mContext.getOpPackageName())) {

                        if (acc.equals(account)) {

                            mAuthenticator.addAccountFromCredentials(

                                    this, account, accountCredentials);
@@ -1609,8 +1605,6 @@ public class AccountManagerService 
                        }

                    }

                }

                    }

                }



                @Override

                public void onResult(Bundle result) {