diff options
| author | Chris Wren <cwren@android.com> | 2013-03-27 17:13:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-27 17:13:13 -0700 |
| commit | 8bec4a9fa2d4cbf0f19be7191367f33dc5e78fca (patch) | |
| tree | bd304360d94147755efc91be5905620d5c37881e | |
| parent | 75a02e78982c00e51b22621d59acc97a71dafd75 (diff) | |
| parent | 144f49ab277544a08499360f650514d6a9fdd93c (diff) | |
| download | android_packages_screensavers_PhotoTable-8bec4a9fa2d4cbf0f19be7191367f33dc5e78fca.tar.gz android_packages_screensavers_PhotoTable-8bec4a9fa2d4cbf0f19be7191367f33dc5e78fca.tar.bz2 android_packages_screensavers_PhotoTable-8bec4a9fa2d4cbf0f19be7191367f33dc5e78fca.zip | |
am 144f49ab: am 9cf665e8: guard against NPEs in bitmap decoding.
* commit '144f49ab277544a08499360f650514d6a9fdd93c':
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); |