commit 91dd26f1854073eecbf970f702b2e8c43a322f67
author Tiger Huang <tigerhuang@google.com> Mon Jun 03 10:50:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 10:50:39 2019 -0700
tree ab8f20b1d86ccc64e629f3330e8032d85f231dfd
parent 448122b4fd2aca24804a818d63ce80e825fb0f8d
parent 7718877720a3c40e9297500219f6cf446ff2294a

Refine onPointerDownOutsideFocus am: 0683fe791e am: e7c4474a4c
am: 7718877720

Change-Id: I44d0f205c4b862e00b54b7d07c09d8c1cd70049e

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;