diff options
| author | Joe Onorato <joeo@google.com> | 2011-01-17 17:25:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-17 17:25:02 -0800 |
| commit | ca29bb28404643574924b972022907006e76ce6f (patch) | |
| tree | 034b0ae7081331d90051f817b25b016f907c1238 /core/java/android/widget | |
| parent | f4c4b666234d0e5c510c846b13382b77175f10e1 (diff) | |
| parent | f01345e19d6ab39c368d030a7741a06d25b4d2cc (diff) | |
Merge "Don't crash with non-standard bitmap types." into honeycomb
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 24165aa7f344..8f2531172c4a 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -796,18 +796,21 @@ public class RemoteViews implements Parcelable, Filter { if (this.value != null) { final Bitmap b = (Bitmap) this.value; final Bitmap.Config c = b.getConfig(); + // If we don't know, be pessimistic and assume 4 int bpp = 4; - switch (c) { - case ALPHA_8: - bpp = 1; - break; - case RGB_565: - case ARGB_4444: - bpp = 2; - break; - case ARGB_8888: - bpp = 4; - break; + if (c != null) { + switch (c) { + case ALPHA_8: + bpp = 1; + break; + case RGB_565: + case ARGB_4444: + bpp = 2; + break; + case ARGB_8888: + bpp = 4; + break; + } } counter.bitmapIncrement(b.getWidth() * b.getHeight() * bpp); } |