commit 4115939d5c530d87553ffffed6c04256212dac1e
author Daniel Sandler <dsandler@google.com> Wed Nov 11 17:31:03 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 11 17:31:03 2009 -0800
tree 12132c5fe69edfb9c2b95f7d92f70e24dcdca01e
parent 5f3594fbf67ecfdeae0719063d9416c984498768
parent 2ce4c3487389e3887c6ec085069422ad69cd570c

am 2ce4c348: am 0c5b5883: am 1325f557: Stop crashing on invalid wallpaper thumbnail images.

Merge commit '2ce4c3487389e3887c6ec085069422ad69cd570c'

* commit '2ce4c3487389e3887c6ec085069422ad69cd570c':
  Stop crashing on invalid wallpaper thumbnail images.

src/com/android/launcher2/WallpaperChooser.java

diff --git a/src/com/android/launcher2/WallpaperChooser.java b/src/com/android/launcher2/WallpaperChooser.java
index a5cce06..a74fa6a 100644
--- a/src/com/android/launcher2/WallpaperChooser.java
+++ b/src/com/android/launcher2/WallpaperChooser.java
@@ -171,9 +171,17 @@
             } else {
                 image = (ImageView) convertView;
             }
-
-            image.setImageResource(mThumbs.get(position));
-            image.getDrawable().setDither(true);
+            
+            int thumbRes = mThumbs.get(position);
+            image.setImageResource(thumbRes);
+            Drawable thumbDrawable = image.getDrawable();
+            if (thumbDrawable != null) {
+                thumbDrawable.setDither(true);
+            } else {
+                Log.e(Launcher.LOG_TAG, String.format(
+                    "Error decoding thumbnail resId=%d for wallpaper #%d",
+                    thumbRes, position));
+            }
             return image;
         }
     }