diff options
| author | Romain Guy <romainguy@android.com> | 2009-09-14 15:15:30 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2009-09-14 15:15:30 -0700 |
| commit | 8c11e31143726c9457280c6c0ec83472763c0de9 (patch) | |
| tree | 22bd1f8d22d96d37d22e3ed05f57f65546583259 /core/java/android/view | |
| parent | 714ec1360cde8b1cbf6e6b8572256e4100f11560 (diff) | |
| download | frameworks_base-8c11e31143726c9457280c6c0ec83472763c0de9.zip frameworks_base-8c11e31143726c9457280c6c0ec83472763c0de9.tar.gz frameworks_base-8c11e31143726c9457280c6c0ec83472763c0de9.tar.bz2 | |
Fix a possible NPE in View.
Change-Id: Ieebd176e1f42c78e298aca973e9e5eed2dc3c6d9
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/View.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f63c2f1..2cc243e 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6042,12 +6042,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility int height = mBottom - mTop; final AttachInfo attachInfo = mAttachInfo; - final float scale = attachInfo.mApplicationScale; + final float scale = attachInfo != null ? attachInfo.mApplicationScale : 1.0f; width = (int) ((width * scale) + 0.5f); height = (int) ((height * scale) + 0.5f); - Bitmap bitmap = Bitmap.createBitmap(width > 0 ? width : 1, - height > 0 ? height : 1, quality); + Bitmap bitmap = Bitmap.createBitmap(width > 0 ? width : 1, height > 0 ? height : 1, quality); if (bitmap == null) { throw new OutOfMemoryError(); } |