diff options
| author | Jim Miller <jaggies@google.com> | 2015-04-07 22:58:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 22:58:53 +0000 |
| commit | e2e945a8871310ab900dbe33b587e522446b9a6d (patch) | |
| tree | 25aca70e8b79dbf226c10a28b321444f6efcf549 /packages | |
| parent | da1bc6057417e0ee6faa1cdd08a0be346a27659a (diff) | |
| parent | 40c4021a70c56bcc4d6f6569d795dff52ab4e369 (diff) | |
| download | frameworks_base-e2e945a8871310ab900dbe33b587e522446b9a6d.zip frameworks_base-e2e945a8871310ab900dbe33b587e522446b9a6d.tar.gz frameworks_base-e2e945a8871310ab900dbe33b587e522446b9a6d.tar.bz2 | |
am 40c4021a: Merge "third part apps can disable the secret lockscreen"
* commit '40c4021a70c56bcc4d6f6569d795dff52ab4e369':
third part apps can disable the secret lockscreen
Diffstat (limited to 'packages')
| -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 e66934e..fae0643 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) { |