From 3d0a74a9e4f54851f223ca70488b249c2acaa226 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 12 Jul 2017 12:37:19 -0700 Subject: Fix egregious state check for window focusability. - The original check should have not assumed that these are only app windows. Bug: 63614176 Test: Ensure that you can unlock with password Change-Id: I71a9959378bbd98a8ed6715d67119d38c3daceb5 --- services/core/java/com/android/server/wm/WindowState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 1bfc1a0047c3..1e0acbcfd0de 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1970,7 +1970,7 @@ class WindowState extends WindowContainer implements WindowManagerP return false; } - final boolean windowsAreFocusable = mAppToken != null && mAppToken.windowsAreFocusable(); + final boolean windowsAreFocusable = mAppToken == null || mAppToken.windowsAreFocusable(); if (!windowsAreFocusable) { // This window can't be an IME target if the app's windows should not be focusable. return false; -- cgit v1.2.3-59-g8ed1b