Merge "Do not hold locks when calling getAccounts" into oc-dev (b70a2225) · Commits · e / os / android_frameworks_base

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) {