Merge "Fix WindowFocusTests#testTapNonFocusableWindow failed"

2019-06-26 15:54:01 +00:00
parent 482c2c994d 4e6e0ec60c
commit 0ea28ecf23
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7694,7 +7694,7 @@ public class WindowManagerService extends IWindowManager.Stub

    private void onPointerDownOutsideFocusLocked(IBinder touchedToken) {
        final WindowState touchedWindow = windowForClientLocked(null, touchedToken, false);
-        if (touchedWindow == null) {
+        if (touchedWindow == null || !touchedWindow.canReceiveKeys()) {
            return;
        }