commit 5c9c7d9fd65e21509dae20b296f01557a18d3764
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 14 16:20:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 14 16:20:09 2012 -0700
tree 8b3de5327a58ab00f3e0735225d57fdf4d613e92
parent 4bd90e5c8b5958164118ddaa6f1b438081c6374b
parent adb2b6554ff7670390a0acd5507dffe430a4cd0d

am adb2b655: am d9001a7d: Merge "NPE in WallpaperHandler"

* commit 'adb2b6554ff7670390a0acd5507dffe430a4cd0d':
  NPE in WallpaperHandler

src/com/android/browser/WallpaperHandler.java

diff --git a/src/com/android/browser/WallpaperHandler.java b/src/com/android/browser/WallpaperHandler.java
index b76861c..0c60664 100644
--- a/src/com/android/browser/WallpaperHandler.java
+++ b/src/com/android/browser/WallpaperHandler.java
@@ -130,7 +130,12 @@
                 }
                 Bitmap scaledWallpaper = BitmapFactory.decodeStream(inputstream,
                         null, options);
-                wm.setBitmap(scaledWallpaper);
+                if (scaledWallpaper != null) {
+                    wm.setBitmap(scaledWallpaper);
+                } else {
+                    Log.e(LOGTAG, "Unable to set new wallpaper, " +
+                            "decodeStream returned null.");
+                }
             }
         } catch (IOException e) {
             Log.e(LOGTAG, "Unable to set new wallpaper");