diff options
| author | Mitsuru Oshima <nobody@android.com> | 2009-04-29 23:20:11 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-29 23:20:11 -0700 |
| commit | 453a34f62bc145ac106d032e64263bdbc904f29f (patch) | |
| tree | 9e3378d0193d44746def9f190be4aed90323c619 | |
| parent | bb15b1cb330bafc0cac993ff0e6bf5c3ba7d10aa (diff) | |
| parent | d4ed0496724d9083ce0762d3a5c0b36183c02f6c (diff) | |
| download | frameworks_base-453a34f62bc145ac106d032e64263bdbc904f29f.zip frameworks_base-453a34f62bc145ac106d032e64263bdbc904f29f.tar.gz frameworks_base-453a34f62bc145ac106d032e64263bdbc904f29f.tar.bz2 | |
am d4ed049: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'
* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
AI 148024: fix NPE when there is no history
| -rw-r--r-- | core/java/android/view/MotionEvent.java | 10 |
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; + } } } } |