summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-06-03 14:41:18 -0700
committerAdrian Roos <roosa@google.com>2015-06-03 23:44:52 +0000
commit461829d607b32ee492b6123043ae4232ed82ae93 (patch)
tree9368e981cd696ec9c4c1419139d0343551093e8c /core/java/android/view
parentd3c9df1a34ec41a8ab6c13911d0887a37170d0cc (diff)
downloadframeworks_base-461829d607b32ee492b6123043ae4232ed82ae93.zip
frameworks_base-461829d607b32ee492b6123043ae4232ed82ae93.tar.gz
frameworks_base-461829d607b32ee492b6123043ae4232ed82ae93.tar.bz2
Prevent windows below the keyguard from showing
Fixes a bug where windows below the lock screen could become visible if a SHOW_WHEN_LOCKED activity hides the status bar. Bug: 21450145 Change-Id: Ie660394cb96d7e6839bd4fb7c2729133bac2dfc5
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/WindowManagerPolicy.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index f7b6405..ca5f5ad 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -1058,6 +1058,13 @@ public interface WindowManagerPolicy {
public boolean isKeyguardSecure();
/**
+ * Return whether the keyguard is on.
+ *
+ * @return true if in keyguard is on.
+ */
+ public boolean isKeyguardShowingOrOccluded();
+
+ /**
* inKeyguardRestrictedKeyInputMode
*
* if keyguard screen is showing or in restricted key input mode (i.e. in