Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h
index 6bf1bfa..f162231 100644
--- a/include/ui/InputReader.h
+++ b/include/ui/InputReader.h
@@ -565,7 +565,9 @@
 
             for (uint32_t i = 0; i < pointerCount; i++) {
                 pointers[i] = other.pointers[i];
-                idToIndex[i] = other.idToIndex[i];
+
+                int id = pointers[i].id;
+                idToIndex[id] = other.idToIndex[id];
             }
         }