Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev

am: f04714c59a Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80
2018-06-04 10:02:32 -07:00
parent bc45dc9536 f04714c59a
commit 6281d64277
7 changed files with 57 additions and 2 deletions
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -603,6 +603,11 @@ public interface WindowManagerPolicy {
         */
        void notifyKeyguardTrustedChanged();

+        /**
+         * The keyguard showing state has changed
+         */
+        void onKeyguardShowingAndNotOccludedChanged();
+
        /**
         * Notifies the window manager that screen is being turned off.
         *