diff options
| author | Jim Miller <jaggies@google.com> | 2015-04-07 22:41:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-07 22:41:19 +0000 |
| commit | 40c4021a70c56bcc4d6f6569d795dff52ab4e369 (patch) | |
| tree | 44b2cff30c9b27e269aedc7e3bf02bac92d40b86 | |
| parent | 7a3c8c70a6c745aa2559a7f769528774021b62a6 (diff) | |
| parent | 261ec767f30c3ed6300cd5668112cb114e05ba18 (diff) | |
| download | base-40c4021a70c56bcc4d6f6569d795dff52ab4e369.tar.gz | |
Merge "third part apps can disable the secret lockscreen"android-wear-5.1.1_r1android-wear-5.1.0_r1
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index e66934e5564f..fae0643c2aef 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -773,6 +773,11 @@ 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) { |