From 4e6e0ec60c1b8f9d90380bb5c550a63f1663ad94 Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Tue, 25 Jun 2019 17:59:39 +0800
Subject: Fix WindowFocusTests#testTapNonFocusableWindow failed

If the touched window can't gain focus, should ignore
set focus to display and task.

Bug: 135899255
Test: atest WindowFocusTests#testTapNonFocusableWindow
Change-Id: Ibd23d4cac9cf1f346f36c83ac66d650a54f8461d
---
 services/core/java/com/android/server/wm/WindowManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 264eedafc56e..2bf24f672119 100644
--- 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;
         }
 
-- 
cgit v1.2.3-59-g8ed1b