Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bdf2d1fa382d4016087b2046beb871e9b3edb8df':
  [Fix Potential for error]:
This commit is contained in:
Simranjit Singh Kohli
2015-05-20 01:16:54 +00:00
committed by Android Git Automerger
parent 6a28532a22 bdf2d1fa38
commit ca33857870
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -2355,9 +2355,9 @@ public class AccountManagerService
callingUid = packageUid; callingUid = packageUid;
} }
checkReadAccountsPermission(); checkReadAccountsPermission();
UserAccounts accounts = getUserAccounts(userId);
long identityToken = clearCallingIdentity(); long identityToken = clearCallingIdentity();
try { try {
UserAccounts accounts = getUserAccounts(userId);
synchronized (accounts.cacheLock) { synchronized (accounts.cacheLock) {
return getAccountsFromCacheLocked(accounts, type, callingUid, callingPackage); return getAccountsFromCacheLocked(accounts, type, callingUid, callingPackage);
} }