commit 588770786f1ba4f8a6bf5fefefa9cead01b5e03b
author Tiger Huang <tigerhuang@google.com> Mon Jun 03 10:41:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 10:41:27 2019 -0700
tree d8f7a80f53487202d81d12d48bd7c120d46aec27
parent 6f85dd3e04b1d75ff60fb3c20fe928226d60977b
parent 0683fe791e810d576584fab816f99eac51f9cff7

Refine onPointerDownOutsideFocus
am: 0683fe791e

Change-Id: I53d581d752fcd7b096fb24639dd3419884fa2eee

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;