commit 2d46ae78543cb895dd28c587f01784bc8e1362f6
author Siarhei Vishniakou <svv@google.com> Fri Aug 25 19:12:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 25 19:12:28 2017 +0000
tree fb39dcb14a50e309ad0811fde4efab60b43e21e2
parent 2b31da173d065f59d443bd81484b795cac954e39
parent c7dc3784a3302b74b895c2e8318adc62b3a0db4d

Ensure history has pointer id of interest.
am: c7dc3784a3

Change-Id: I810a5f46a324aa9592418355e5d9838af8875622

include/input/InputTransport.h

diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h
index 0dd15b1..9449474 100644
--- a/include/input/InputTransport.h
+++ b/include/input/InputTransport.h
@@ -384,6 +384,10 @@
         const PointerCoords& getPointerById(uint32_t id) const {
             return pointers[idToIndex[id]];
         }
+
+        bool hasPointerId(uint32_t id) const {
+            return idBits.hasBit(id);
+        }
     };
     struct TouchState {
         int32_t deviceId;
@@ -419,6 +423,9 @@
             if (historySize < 2) {
                 return false;
             }
+            if (!getHistory(0)->hasPointerId(id) || !getHistory(1)->hasPointerId(id)) {
+                return false;
+            }
             float currentX = getHistory(0)->getPointerById(id).getX();
             float currentY = getHistory(0)->getPointerById(id).getY();
             float previousX = getHistory(1)->getPointerById(id).getX();