summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-03-26 05:32:58 -0700
committerMichael Jurka <mikejurka@google.com>2012-03-26 05:33:38 -0700
commit6d4c3dba36c58d5a872b745dccb5f13e76c9b15f (patch)
tree3be3b810ab3b39e529d87290da523a1d4f0a6b2a
parent621f1c9f2fd227da4563bc22e4d3f4a27591a111 (diff)
downloadandroid_packages_wallpapers_LivePicker-6d4c3dba36c58d5a872b745dccb5f13e76c9b15f.tar.gz
android_packages_wallpapers_LivePicker-6d4c3dba36c58d5a872b745dccb5f13e76c9b15f.tar.bz2
android_packages_wallpapers_LivePicker-6d4c3dba36c58d5a872b745dccb5f13e76c9b15f.zip
Fix NPE in Live Wallpaper picker
Bug: 5913040 Change-Id: Ic8e975ca1a9b9712509c6e9b31d55be2111e36a1
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index 54b6382..d4f7ef7 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -58,6 +58,10 @@ public class LiveWallpaperPreview extends Activity {
private Dialog mDialog;
static void showPreview(Activity activity, int code, Intent intent, WallpaperInfo info) {
+ if (info == null) {
+ Log.w(LOG_TAG, "Failure showing preview", new Throwable());
+ return;
+ }
Intent preview = new Intent(activity, LiveWallpaperPreview.class);
preview.putExtra(EXTRA_LIVE_WALLPAPER_INTENT, intent);
preview.putExtra(EXTRA_LIVE_WALLPAPER_SETTINGS, info.getSettingsActivity());