am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen"

* commit 'e2e945a8871310ab900dbe33b587e522446b9a6d': third part apps can disable the secret lockscreen
2015-04-07 23:08:05 +00:00
parent 66a51c7080 e2e945a887
commit 5dd10bd11a
1 changed files with 5 additions and 0 deletions
--- 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) {