From 6d4c3dba36c58d5a872b745dccb5f13e76c9b15f Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 26 Mar 2012 05:32:58 -0700
Subject: Fix NPE in Live Wallpaper picker

Bug: 5913040

Change-Id: Ic8e975ca1a9b9712509c6e9b31d55be2111e36a1
---
 src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

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());
-- 
cgit v1.2.3