commit 39f1cd8045e242db411a5c3940f1ad3f9f8f8490
author Dan Austin <danielaustin@google.com> Wed Sep 23 15:05:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 23 15:05:01 2015 +0000
tree bf98c56ef3c4309b02ef2c0ecf811de7ffca2792
parent 434fbee3404ccc1007ad955ba892412e1e9df9cf
parent 9040362b1ec56f077e9bca395939a6669ffa8303

am 9040362b: am fc6a2bff: am 146f31b6: Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"

* commit '9040362b1ec56f077e9bca395939a6669ffa8303':
  Eliminate benign overflow condition triggered upon loop termination in Input.cpp

libs/input/Input.cpp

diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index 88cd653..0155007 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -456,7 +456,8 @@
         properties.toolType = parcel->readInt32();
     }
 
-    while (sampleCount-- > 0) {
+    while (sampleCount > 0) {
+        sampleCount--;
         mSampleEventTimes.push(parcel->readInt64());
         for (size_t i = 0; i < pointerCount; i++) {
             mSamplePointerCoords.push();