commit adb2b6554ff7670390a0acd5507dffe430a4cd0d
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 14 16:16:20 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 14 16:16:20 2012 -0700
tree c71af13eddc9901067f8e6cf2d80174534e4f578
parent d2a59930d8958f58a96409fc8efe68a53b976ed8
parent d9001a7dc5854d5dfc24a5ead19ad8c05acf171e

am d9001a7d: Merge "NPE in WallpaperHandler"

* commit 'd9001a7dc5854d5dfc24a5ead19ad8c05acf171e':
  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");