commit 40c4021a70c56bcc4d6f6569d795dff52ab4e369
author Jim Miller <jaggies@google.com> Tue Apr 07 22:41:17 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 22:41:19 2015 +0000
tree 44b2cff30c9b27e269aedc7e3bf02bac92d40b86
parent 7a3c8c70a6c745aa2559a7f769528774021b62a6
parent 261ec767f30c3ed6300cd5668112cb114e05ba18

Merge "third part apps can disable the secret lockscreen"

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

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 @@
         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) {