commit 11d2617b8bc93cdf6f49312680a0fc10a71ddfdd
author Prabir Pradhan <prabirmsp@google.com> Thu Apr 28 14:25:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 28 14:25:14 2022 +0000
tree bb2b3422026e7fbc79aee51653a264ad9641de85
parent 1987dbca0d6f30bd48bcaf91be5317f623dc793d
parent d34c726720810d47f9831b325b3b2d89b51257a5

Merge "Address ghost spots that show up after touchscreen is re-enabled" into tm-dev am: 02ecde0361 am: d34c726720

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17981599

Change-Id: I7466529d0e3a7944bb09b147668ca36a5a85f93a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index c1934ff..637b1cb 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -1657,9 +1657,8 @@
 
         dispatchPointerUsage(when, readTime, policyFlags, pointerUsage);
     } else {
-        updateTouchSpots();
-
         if (!mCurrentMotionAborted) {
+            updateTouchSpots();
             dispatchButtonRelease(when, readTime, policyFlags);
             dispatchHoverExit(when, readTime, policyFlags);
             dispatchTouches(when, readTime, policyFlags);