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

Commit fa0b6b28 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

frameworks: prepare for Profiles trust agent 



Remove checks for Profile.LockMode.INSECURE.
This logic will be handled by the Trust Agent API now.

Change-Id: I035911d7d8f3f9c8006eb4256fb8332f172bab1b
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 7f1bf5c5

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1604,7 +1604,7 @@ public class LockPatternUtils { 
        final boolean secure =

                isPattern && isLockPatternEnabled(userId) && savedPatternExists(userId)

                || isPassword && savedPasswordExists(userId);

        return secure && getActiveProfileLockMode() == Profile.LockMode.DEFAULT;

        return secure && getActiveProfileLockMode() != Profile.LockMode.DISABLE;

    }



    public int getActiveProfileLockMode() {

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class KeyguardSecurityModel { 
        } else if (simState == IccCardConstants.State.PUK_REQUIRED

                && mLockPatternUtils.isPukUnlockScreenEnable()) {

            mode = SecurityMode.SimPuk;

        } else if (mLockPatternUtils.getActiveProfileLockMode() != Profile.LockMode.INSECURE) {

        } else {

            final int security = mLockPatternUtils.getKeyguardStoredPasswordQuality();

            switch (security) {

                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: