diff options
| author | Jim Miller <jaggies@google.com> | 2015-04-07 23:18:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 23:18:57 +0000 |
| commit | c68b9d6acc69104b67f9f133ee8fefd049d9c21a (patch) | |
| tree | b3041f7c1f39477d90db341c380893bf46d50a47 /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | 07e1967cfce129afd0db3beefde343fe59405dc5 (diff) | |
| parent | 5dd10bd11a524e224a88615444bf8b52b1ec11d6 (diff) | |
| download | frameworks_base-c68b9d6acc69104b67f9f133ee8fefd049d9c21a.zip frameworks_base-c68b9d6acc69104b67f9f133ee8fefd049d9c21a.tar.gz frameworks_base-c68b9d6acc69104b67f9f133ee8fefd049d9c21a.tar.bz2 | |
am 5dd10bd1: am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen"
* commit '5dd10bd11a524e224a88615444bf8b52b1ec11d6':
third part apps can disable the secret lockscreen
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -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 dd28734..d8e732e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -748,6 +748,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) { |