diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-24 12:53:49 +0100 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2013-09-24 12:53:49 +0100 |
| commit | b92f43313650400b9dfadf7264a740a38bf3cb7f (patch) | |
| tree | a901692469a69524043d40f4cd3b5e0ca009beb9 /src/com | |
| parent | 1e4e6ddb38d0b867d0564be834f3425ed53d46e1 (diff) | |
| download | android_packages_apps_Trebuchet-b92f43313650400b9dfadf7264a740a38bf3cb7f.tar.gz android_packages_apps_Trebuchet-b92f43313650400b9dfadf7264a740a38bf3cb7f.tar.bz2 android_packages_apps_Trebuchet-b92f43313650400b9dfadf7264a740a38bf3cb7f.zip | |
Fix NPE
Bug: 10906469
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 5f35cde21..bc56b5545 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -211,11 +211,11 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { 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); } @@ -307,8 +307,10 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { 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); + } } }); |