NPE in WallpaperHandler

In WallpaperHandler, BitmapFactory.decodeStream() is used to create
a Bitmap that is then set by WallpaperManager as a wallpaper.
This method has null as return value when something fails as
decoding, resulting in a nullpointer exception in WallpaperManager.
Adding nullcheck on the Bitmap before setting it as wallpaper to
avoid the NPE.

Change-Id: Ib1a0f9331898162b21094c3ebe80bc21d66f8bd7

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/browser/WallpaperHandler.java b/src/com/android/browser/WallpaperHandler.java
index b76861ccc..0c60664ef 100644
--- a/src/com/android/browser/WallpaperHandler.java
+++ b/src/com/android/browser/WallpaperHandler.java
@@ -130,7 +130,12 @@ public class WallpaperHandler extends Thread
                 }
                 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");