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

Commit 55bcae86 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Add a guard against NullPointerException in RestrictedLockUtils."

parents 751766a5 0fa74125

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java

+10 −8
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ public class RestrictedLockUtils { 
        ComponentName adminComponent = null;

        List<ComponentName> admins = dpm.getActiveAdmins();

        int quality;

        if (admins != null) {

            for (ComponentName admin : admins) {

                quality = dpm.getPasswordQuality(admin);

                if (quality >= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
@@ -255,6 +256,7 @@ public class RestrictedLockUtils { 
                    }

                }

            }

        }

        EnforcedAdmin enforcedAdmin = null;

        if (adminComponent != null) {

            if (!isDisabledByMultipleAdmins) {