diff options
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 42b73b9..72af34d 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -281,7 +281,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, mUpdateMonitor.registerSimStateCallback(this); mLockPatternUtils = new LockPatternUtils(mContext); - mKeyguardViewProperties + mKeyguardViewProperties = new LockPatternKeyguardViewProperties(mLockPatternUtils, mUpdateMonitor); mKeyguardViewManager = new KeyguardViewManager( @@ -589,6 +589,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback, return; } + if (mLockPatternUtils.isLockScreenDisabled()) { + if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off"); + return; + } + if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(); } @@ -1005,7 +1010,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, Log.d(TAG, "playSounds: whichSound = " + whichSound + "; soundPath was null"); } } - } + } /** * Handle message sent by {@link #showLocked}. |