From 4e68b6572306fb4a44e78b3cf2b48fb943e69cbe Mon Sep 17 00:00:00 2001 From: Adili Muguro Date: Fri, 25 Jul 2014 16:42:39 +0200 Subject: [PATCH] Fixed a NullPointerException in AccountManagerService. Change-Id: If65d7870c609ae6c7467e26978ffd0ce0d52f518 --- .../com/android/server/accounts/AccountManagerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 9a86136cddbb6..2a66baf45690e 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -3144,6 +3144,9 @@ public class AccountManagerService DevicePolicyManager dpm = (DevicePolicyManager) mContext .getSystemService(Context.DEVICE_POLICY_SERVICE); String[] typesArray = dpm.getAccountTypesWithManagementDisabledAsUser(userId); + if (typesArray == null) { + return true; + } for (String forbiddenType : typesArray) { if (forbiddenType.equals(accountType)) { return false;