diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-07 18:40:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-07 18:40:19 +0000 |
| commit | 69ed33087d77e32a1f1475adf00b9d87580960aa (patch) | |
| tree | e975fb4abb31792d688e5829212e72be70ce6cc1 /packages/SystemUI/src | |
| parent | 1fbc1b3b4b742cdba25d32d65a9813933a37005f (diff) | |
| parent | b978ce7f25011add50e900d5745f3e066cddfd55 (diff) | |
| download | frameworks_base-69ed33087d77e32a1f1475adf00b9d87580960aa.zip frameworks_base-69ed33087d77e32a1f1475adf00b9d87580960aa.tar.gz frameworks_base-69ed33087d77e32a1f1475adf00b9d87580960aa.tar.bz2 | |
Merge "Allow system to disable lockscreen" into mnc-dev
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) { |