Merge "Return null when user is locked" into nyc-dev (6eb8c15b) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -828,6 +828,10 @@ public class AccountManagerService
		account.type);
		throw new SecurityException(msg);
		}
		if (!isUserUnlocked(userId)) {
		Log.w(TAG, "User " + userId + " data is locked. callingUid " + callingUid);
		return null;
		}
		long identityToken = clearCallingIdentity();
		try {
		UserAccounts accounts = getUserAccounts(userId);
		@@ -1788,6 +1792,11 @@ public class AccountManagerService
		account.type);
		throw new SecurityException(msg);
		}
		if (!isUserUnlocked(userId)) {
		Log.w(TAG, "Authtoken not available - user " + userId + " data is locked. callingUid "
		+ callingUid);
		return null;
		}
		long identityToken = clearCallingIdentity();
		try {
		UserAccounts accounts = getUserAccounts(userId);