summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2017-07-12 19:58:56 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-12 19:58:56 +0000
commit0ca8f5bb128fcd022d8767e849a1be268305445c (patch)
tree1952cf2f3a27ec0f3b96959c63788fa99b634e0c
parent727b06b498e9df2b8cdc37421b7323c37d86c56b (diff)
parent3d0a74a9e4f54851f223ca70488b249c2acaa226 (diff)
Fix egregious state check for window focusability.
am: 3d0a74a9e4 Change-Id: I68aac94729227b30e2ba05bf2e89afae5a9debbf
-rw-r--r--services/core/java/com/android/server/wm/WindowState.java2
1 files changed, 1 insertions, 1 deletions
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<WindowState> 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;