commit e7c4474a4c84eef245a60725e27e19866e23bdf5
author Tiger Huang <tigerhuang@google.com> Mon Jun 03 10:39:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 10:39:57 2019 -0700
tree ba69e9d6b53fcc69453bf0751b9fae94b67e56f9
parent d87fe8d7f56798d0ac806e4be9a56696c6ce8b17
parent 0683fe791e810d576584fab816f99eac51f9cff7

Refine onPointerDownOutsideFocus
am: 0683fe791e

Change-Id: Ie0511b7c883c6b93cd20bdbf1bdd909476f6d81e

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;