diff options
| author | Chris Wren <cwren@android.com> | 2013-03-27 17:09:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-27 17:09:43 -0700 |
| commit | 144f49ab277544a08499360f650514d6a9fdd93c (patch) | |
| tree | c940612fddb193e018c3022eb6478bb1c15732cf | |
| parent | de9f38ac52d0523e84ed6f71cca5803367225f60 (diff) | |
| parent | 9cf665e832e1ad67dcee625f78c78743e60aecbe (diff) | |
| download | android_packages_screensavers_PhotoTable-144f49ab277544a08499360f650514d6a9fdd93c.tar.gz android_packages_screensavers_PhotoTable-144f49ab277544a08499360f650514d6a9fdd93c.tar.bz2 android_packages_screensavers_PhotoTable-144f49ab277544a08499360f650514d6a9fdd93c.zip | |
am 9cf665e8: guard against NPEs in bitmap decoding.
* commit '9cf665e832e1ad67dcee625f78c78743e60aecbe':
guard against NPEs in bitmap decoding.
| -rw-r--r-- | src/com/android/dreams/phototable/PhotoTable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dreams/phototable/PhotoTable.java b/src/com/android/dreams/phototable/PhotoTable.java index 36b274c..b0d7a01 100644 --- a/src/com/android/dreams/phototable/PhotoTable.java +++ b/src/com/android/dreams/phototable/PhotoTable.java @@ -260,7 +260,7 @@ public class PhotoTable extends FrameLayout { table.mLongSide, table.mShortSide); int photoWidth = mOptions.outWidth; int photoHeight = mOptions.outHeight; - if (mOptions.outWidth <= 0 || mOptions.outHeight <= 0) { + if (decodedPhoto == null || mOptions.outWidth <= 0 || mOptions.outHeight <= 0) { photo = null; } else { decodedPhoto.setHasMipMap(true); |