commit 6f372bb723a87bb6c292067a848e1c4aa8153107
author Michael Jurka <mikejurka@google.com> Fri Nov 08 08:19:57 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 08 08:19:57 2013 -0800
tree 141c553740922aaed5f3a375f16cb71c5962d062
parent a05060c987529a7443d66d5117408a120beec411
parent 5fa148a1d9204a3de3177aef18c80506de2879e8

am 5fa148a1: am 5bfab60f: Fix NPE in Live Wallpaper loader

* commit '5fa148a1d9204a3de3177aef18c80506de2879e8':
  Fix NPE in Live Wallpaper loader

src/com/android/launcher3/LiveWallpaperListAdapter.java

diff --git a/src/com/android/launcher3/LiveWallpaperListAdapter.java b/src/com/android/launcher3/LiveWallpaperListAdapter.java
index 54e0af7..152a75d 100644
--- a/src/com/android/launcher3/LiveWallpaperListAdapter.java
+++ b/src/com/android/launcher3/LiveWallpaperListAdapter.java
@@ -190,7 +190,9 @@
                     LiveWallpaperListAdapter.this.notifyDataSetChanged();
                     break;
                 }
-                info.mThumbnail.setDither(true);
+                if (info.mThumbnail != null) {
+                    info.mThumbnail.setDither(true);
+                }
                 if (mWallpaperPosition < mWallpapers.size()) {
                     mWallpapers.set(mWallpaperPosition, info);
                 } else {