Merge "[Fix Potential for error]:" into mnc-dev (bdf2d1fa) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}