am bdf2d1fa: Merge "[Fix Potential for error]:" into mnc-dev

* commit 'bdf2d1fa382d4016087b2046beb871e9b3edb8df': [Fix Potential for error]:
2015-05-20 01:16:54 +00:00
parent 6a28532a22 bdf2d1fa38
commit ca33857870
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -2355,9 +2355,9 @@ public class AccountManagerService
            callingUid = packageUid;
        }
        checkReadAccountsPermission();
-        UserAccounts accounts = getUserAccounts(userId);
        long identityToken = clearCallingIdentity();
        try {
+            UserAccounts accounts = getUserAccounts(userId);
            synchronized (accounts.cacheLock) {
                return getAccountsFromCacheLocked(accounts, type, callingUid, callingPackage);
            }