commit 6a841cb88bbadbac576b31c39710e632a5978a63
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 30 19:02:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 30 19:02:39 2017 +0000
tree b5f28318ac354ef04b23a9a39bf51d16415c52ac
parent 217ecd0729809508c731dc5f49b437fd9681b65e
parent 16bedd439775fdbf39ba9aec6a2815791b41e006

Merge "Do not hold locks when calling getAccounts" into oc-dev

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

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 0ccaf8e..625e4a5 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1597,17 +1597,11 @@
                 @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())) {
-                                if (acc.equals(account)) {
-                                    mAuthenticator.addAccountFromCredentials(
-                                            this, account, accountCredentials);
-                                    break;
-                                }
-                            }
+                    for (Account acc : getAccounts(parentUserId, mContext.getOpPackageName())) {
+                        if (acc.equals(account)) {
+                            mAuthenticator.addAccountFromCredentials(
+                                    this, account, accountCredentials);
+                            break;
                         }
                     }
                 }