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

Commit fb8cc5de authored by Danny Baumann's avatar Danny Baumann Committed by Roman Birg
Browse files

Respect DPM when deciding whether keyguard is disabled by profile. 

Change-Id: I2fd50e1edd517956a59770a2ecd754cea0003c1c
parent 58cc0edc

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

+3 −6
Original line number Diff line number Diff line
@@ -720,13 +720,10 @@ public class KeyguardViewMediator { 
            if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled by setting");

            return true;

        }

        Profile profile = mProfileManager.getActiveProfile();

        if (profile != null) {

            if (profile.getScreenLockMode() == Profile.LockMode.DISABLE) {

        if (mLockPatternUtils.getActiveProfileLockMode() == Profile.LockMode.DISABLE) {

            if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled by profile");

            return true;

        }

        }

        return false;

    }