diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-07 18:46:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:46:58 +0000 |
| commit | 69a07d401a3d40de6d5f17eeaf642db12401fe2f (patch) | |
| tree | 1ed3a15605e21a01e49eec7e65274d0d5505ed2e /packages/SystemUI/src | |
| parent | 85b3d0347955d7244f7d5b89f80482a73e70a0ed (diff) | |
| parent | 69ed33087d77e32a1f1475adf00b9d87580960aa (diff) | |
| download | frameworks_base-69a07d401a3d40de6d5f17eeaf642db12401fe2f.zip frameworks_base-69a07d401a3d40de6d5f17eeaf642db12401fe2f.tar.gz frameworks_base-69a07d401a3d40de6d5f17eeaf642db12401fe2f.tar.bz2 | |
am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
Allow system to disable lockscreen
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 9f86a52..c1df788 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -841,11 +841,6 @@ public class KeyguardViewMediator extends SystemUI { synchronized (this) { if (DEBUG) Log.d(TAG, "setKeyguardEnabled(" + enabled + ")"); - if (isSecure()) { - Log.d(TAG, "current mode is SecurityMode, ignore hide keyguard"); - return; - } - mExternallyEnabled = enabled; if (!enabled && mShowing) { |