commit 7718877720a3c40e9297500219f6cf446ff2294a
author Tiger Huang <tigerhuang@google.com> Mon Jun 03 10:45:25 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 10:45:25 2019 -0700
tree 0a8240a1d54ae0f765f3161568b953eab235778e
parent ca15861b9d908e1485ab85fbf54ce2804e968e21
parent e7c4474a4c84eef245a60725e27e19866e23bdf5

Refine onPointerDownOutsideFocus am: 0683fe791e
am: e7c4474a4c

Change-Id: I8d9e8f75e76ad450c83da97d16723d1a52919b26

services/inputflinger/InputDispatcher.cpp

diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp
index 31a2dab..c2ff4c9 100644
--- a/services/inputflinger/InputDispatcher.cpp
+++ b/services/inputflinger/InputDispatcher.cpp
@@ -2172,9 +2172,8 @@
         return;
     }
 
-    int32_t displayId = inputWindowHandle->getInfo()->displayId;
     sp<InputWindowHandle> focusedWindowHandle =
-            getValueByKey(mFocusedWindowHandlesByDisplay, displayId);
+            getValueByKey(mFocusedWindowHandlesByDisplay, mFocusedDisplayId);
 
     bool hasFocusChanged = !focusedWindowHandle || focusedWindowHandle->getToken() != newToken;