summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorMitsuru Oshima <nobody@android.com>2009-04-29 17:15:14 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-29 17:15:14 -0700
commitd4ed0496724d9083ce0762d3a5c0b36183c02f6c (patch)
treefaa9d44fdafd17a3b41667a1c09bdb4a198a68c2 /core/java/android/view
parent7fe3b064d3645fcebd09b162c5989e0d702112e2 (diff)
parentdffbb4dbceb7e90e91b65d02dfdbd1abd6147b94 (diff)
downloadframeworks_base-d4ed0496724d9083ce0762d3a5c0b36183c02f6c.zip
frameworks_base-d4ed0496724d9083ce0762d3a5c0b36183c02f6c.tar.gz
frameworks_base-d4ed0496724d9083ce0762d3a5c0b36183c02f6c.tar.bz2
Merge branch 'readonly-p4-donut' into donut
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/MotionEvent.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 2402660..0d55679 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -225,10 +225,12 @@ public final class MotionEvent implements Parcelable {
mSize *= scale;
mXPrecision *= scale;
mYPrecision *= scale;
- float[] history = mHistory;
- int length = history.length;
- for (int i = 0; i < length; i++) {
- history[i] *= scale;
+ if (mHistory != null) {
+ float[] history = mHistory;
+ int length = history.length;
+ for (int i = 0; i < length; i++) {
+ history[i] *= scale;
+ }
}
}
}