summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2018-06-04 10:02:32 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-04 10:02:32 -0700
commit6281d6427720275f4c09328cfc15efbab175ca91 (patch)
tree0640601f6484fb99e9b4de9a25b5182cdbf96bf0 /core/java/android
parentbc45dc95360a59ce2eb6d0354a780e5389f87825 (diff)
parentf04714c59a5ad92e79bb037372f90213e46a92e8 (diff)
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev
am: f04714c59a Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/WindowManagerPolicy.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index 49b7ed8bac0e..f09557d832d5 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -604,6 +604,11 @@ public interface WindowManagerPolicy {
void notifyKeyguardTrustedChanged();
/**
+ * The keyguard showing state has changed
+ */
+ void onKeyguardShowingAndNotOccludedChanged();
+
+ /**
* Notifies the window manager that screen is being turned off.
*
* @param listener callback to call when display can be turned off