diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-04-03 20:55:27 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-04-03 20:55:31 +0700 |
| commit | 9e331a9c7a5af08a8b25e35310ca576aff848181 (patch) | |
| tree | 9f1a538aa74fc5ae36e48e0b4967502071ed3f6e /policy | |
| parent | ccab0c0b90d0b0a185557d727198df0b7c420087 (diff) | |
| download | frameworks_base-9e331a9c7a5af08a8b25e35310ca576aff848181.zip frameworks_base-9e331a9c7a5af08a8b25e35310ca576aff848181.tar.gz frameworks_base-9e331a9c7a5af08a8b25e35310ca576aff848181.tar.bz2 | |
Profile: respect DPM when overriding screen lock (1/2)
Profile currently allows the user to override the keyguard set by
device policy, which is undesired.
Change-Id: Id8d80cfdad51ca0a64dc231a77e53b104ecb9825
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java | 2 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java index 6ede504..7090965 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java @@ -88,7 +88,7 @@ public class KeyguardSecurityModel { } else if (simState == IccCardConstants.State.PUK_REQUIRED && mLockPatternUtils.isPukUnlockScreenEnable()) { mode = SecurityMode.SimPuk; - } else if (mProfileManager.getActiveProfile().getScreenLockMode() != Profile.LockMode.INSECURE) { + } else if (mProfileManager.getActiveProfile().getScreenLockModeWithDPM(mContext) != Profile.LockMode.INSECURE) { final int security = mLockPatternUtils.getKeyguardStoredPasswordQuality(); switch (security) { case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index a39b2f7..a505185 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -924,7 +924,7 @@ public class KeyguardViewMediator { Profile profile = mProfileManager.getActiveProfile(); if (profile != null) { if (!lockedOrMissing - && profile.getScreenLockMode() == Profile.LockMode.DISABLE) { + && profile.getScreenLockModeWithDPM(mContext) == Profile.LockMode.DISABLE) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because of profile override"); return; } |