summaryrefslogtreecommitdiffstats
path: root/services/java/com/android
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-06-10 14:13:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-10 14:13:51 -0700
commit8f1bfb001b522a370a65c8e4545183b7611f672b (patch)
treed6f61406df1a090fe5f7786d3e52f26df95dcc0d /services/java/com/android
parent8d3002806593f090ee570c04e4620b90df4d5c8b (diff)
parent8f2ca788f369892370477212cf9e7a67721a8c16 (diff)
downloadframeworks_base-8f1bfb001b522a370a65c8e4545183b7611f672b.zip
frameworks_base-8f1bfb001b522a370a65c8e4545183b7611f672b.tar.gz
frameworks_base-8f1bfb001b522a370a65c8e4545183b7611f672b.tar.bz2
am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into kraken * commit '8f2ca788f369892370477212cf9e7a67721a8c16': Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
Diffstat (limited to 'services/java/com/android')
-rw-r--r--services/java/com/android/server/InputDevice.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/InputDevice.java b/services/java/com/android/server/InputDevice.java
index 07a74da..414b69f 100644
--- a/services/java/com/android/server/InputDevice.java
+++ b/services/java/com/android/server/InputDevice.java
@@ -671,6 +671,8 @@ public class InputDevice {
System.arraycopy(lastData, i*MotionEvent.NUM_SAMPLE_DATA,
lastData, (i+1)*MotionEvent.NUM_SAMPLE_DATA,
(lastNumPointers-i)*MotionEvent.NUM_SAMPLE_DATA);
+ System.arraycopy(next2Last, i, next2Last,
+ i+1, lastNumPointers-i);
break;
}
i++;