commit 10f3e9ff1aca9772272c74a36ea381193d3f1139
author Michael Jurka <mikejurka@google.com> Wed Sep 25 22:34:05 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 25 22:34:06 2013 +0000
tree c5fec3930a17d9a79e69229d213e12fbb8d16635
parent 3727811f5195396f217bea046110747914385b16
parent b92f43313650400b9dfadf7264a740a38bf3cb7f

Merge "Fix NPE" into jb-ub-now-indigo-rose

src/com/android/launcher3/WallpaperPickerActivity.java

diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index a7c96f5..7f82a2f 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -217,11 +217,11 @@
                     return;
                 }
                 WallpaperTileInfo info = (WallpaperTileInfo) v.getTag();
-                if (mSelectedThumb != null) {
-                    mSelectedThumb.setSelected(false);
-                    mSelectedThumb = null;
-                }
                 if (info.isSelectable()) {
+                    if (mSelectedThumb != null) {
+                        mSelectedThumb.setSelected(false);
+                        mSelectedThumb = null;
+                    }
                     mSelectedThumb = v;
                     v.setSelected(true);
                 }
@@ -313,8 +313,10 @@
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        WallpaperTileInfo info = (WallpaperTileInfo) mSelectedThumb.getTag();
-                        info.onSave(WallpaperPickerActivity.this);
+                        if (mSelectedThumb != null) {
+                            WallpaperTileInfo info = (WallpaperTileInfo) mSelectedThumb.getTag();
+                            info.onSave(WallpaperPickerActivity.this);
+                        }
                     }
                 });