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

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

Merge "Fix admin check in Settings."

parents a94c46b0 74272138

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

+12 −10
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ public class RestrictedLockUtils { 
        boolean isDisabledByMultipleAdmins = false;

        ComponentName adminComponent = null;

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

        if (admins != null) {

            int disabledKeyguardFeatures;

            for (ComponentName admin : admins) {

                disabledKeyguardFeatures = dpm.getKeyguardDisabledFeatures(admin);
@@ -140,6 +141,7 @@ public class RestrictedLockUtils { 
                    }

                }

            }

        }

        EnforcedAdmin enforcedAdmin = null;

        if (adminComponent != null) {

            if (!isDisabledByMultipleAdmins) {