am 3cea91e0: am 3c2a02dc: am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev

* commit '3cea91e07330b6778c03510dbf7a7f71fc8477d5': Fixed a NullPointerException in AccountManagerService.
2014-07-30 21:24:09 +00:00
parent 761090cb1b 8c946e963d
commit b38d76d338
1 changed files with 3 additions and 0 deletions
--- 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;