diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-14 15:24:22 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-14 15:24:22 -0700 |
| commit | d9001a7dc5854d5dfc24a5ead19ad8c05acf171e (patch) | |
| tree | d4cc8a28cdff5c879250bcd9df35cc622223df12 /src | |
| parent | edc9e064969b97fd62f492ef8e15812b63af2bb3 (diff) | |
| parent | 4db7e933f4c26e28f82dc912863f7d02d8fb94ab (diff) | |
| download | packages_apps_browser-d9001a7dc5854d5dfc24a5ead19ad8c05acf171e.zip packages_apps_browser-d9001a7dc5854d5dfc24a5ead19ad8c05acf171e.tar.gz packages_apps_browser-d9001a7dc5854d5dfc24a5ead19ad8c05acf171e.tar.bz2 | |
Merge "NPE in WallpaperHandler"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/WallpaperHandler.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ 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"); |