summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2010-08-03 12:22:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-03 12:22:50 -0700
commit5d46ce24cc46dc57d31f809302af916999114ced (patch)
treebbcb71ba972953e67545f072167cae58bb5cbdac /include
parent9abce39a991a6bc1cfab4284b5448a4f676bb06f (diff)
parent9e2ad36be87f2703b3d737189944d82f93bd4f27 (diff)
downloadframeworks_base-5d46ce24cc46dc57d31f809302af916999114ced.zip
frameworks_base-5d46ce24cc46dc57d31f809302af916999114ced.tar.gz
frameworks_base-5d46ce24cc46dc57d31f809302af916999114ced.tar.bz2
Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
Diffstat (limited to 'include')
-rw-r--r--include/ui/InputReader.h4
1 files changed, 3 insertions, 1 deletions
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 @@ protected:
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];
}
}