summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-27 15:03:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-27 15:03:12 -0700
commitb7c64f15850ff5d1a8a2895bfb40b430344fa9ed (patch)
treed9628eef2dac301fd6c8246aaf28797bb6aa020b /core/java
parent692a316d48037b79fb494864b2d25edf2b162510 (diff)
parentdac57e4ec94591207eeb660adbe53245dd78e713 (diff)
Merge change 8683
* changes: Fix a bug that was causing ArrayIndexOutOfBoutExceptions when obtaining a MotionEvent from an older one that had a number of time samples.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/MotionEvent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 89b721d85435..d46660c2e7ba 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -509,7 +509,7 @@ public final class MotionEvent implements Parcelable {
ev.mYPrecision = o.mYPrecision;
final int NT = ev.mNumSamples = o.mNumSamples;
- if (ev.mTimeSamples.length < NT) {
+ if (ev.mTimeSamples.length >= NT) {
System.arraycopy(o.mTimeSamples, 0, ev.mTimeSamples, 0, NT);
} else {
ev.mTimeSamples = (long[])o.mTimeSamples.clone();