Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev (a5d3e030) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3144,6 +3144,9 @@ public class AccountManagerService
	DevicePolicyManager dpm = (DevicePolicyManager) mContext		DevicePolicyManager dpm = (DevicePolicyManager) mContext
	.getSystemService(Context.DEVICE_POLICY_SERVICE);		.getSystemService(Context.DEVICE_POLICY_SERVICE);
	String[] typesArray = dpm.getAccountTypesWithManagementDisabledAsUser(userId);		String[] typesArray = dpm.getAccountTypesWithManagementDisabledAsUser(userId);
			if (typesArray == null) {
			return true;
			}
	for (String forbiddenType : typesArray) {		for (String forbiddenType : typesArray) {
	if (forbiddenType.equals(accountType)) {		if (forbiddenType.equals(accountType)) {
	return false;		return false;