Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c946e96 authored by Sean Wan's avatar Sean Wan Committed by Android Git Automerger
Browse files

am 3c2a02dc: am b4a0e3ef: Merge "Fixed a NullPointerException in... 

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

* commit '3c2a02dcab22a8c70bf4b5bdad7a19b84e89fd12':
  Fixed a NullPointerException in AccountManagerService.
parents 623a0631 5ce8efc4

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

+3 −0
Original line number Diff line number Diff line
@@ -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;