From a7e22413eb860a1d9ffb46221c63e29ba7330ff5 Mon Sep 17 00:00:00 2001 From: Mark Wei Date: Thu, 30 Aug 2012 11:37:20 -0700 Subject: Fix NullPointerException when tapping attachment. Bug: 7083179 Change-Id: I9955aeda9a0d2bb6d30ce9f7e7e3961cb47284e0 --- photoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java | 4 +++- photoviewer/src/com/android/ex/photo/util/ImageUtils.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/photoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java b/photoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java index 7049370..fe42e0d 100644 --- a/photoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java +++ b/photoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java @@ -52,7 +52,9 @@ public class PhotoBitmapLoader extends AsyncTaskLoader { final ContentResolver resolver = context.getContentResolver(); Bitmap bitmap = ImageUtils.createLocalBitmap(resolver, Uri.parse(mPhotoUri), PhotoViewFragment.sPhotoSize); - bitmap.setDensity(DisplayMetrics.DENSITY_MEDIUM); + if (bitmap != null) { + bitmap.setDensity(DisplayMetrics.DENSITY_MEDIUM); + } return bitmap; } diff --git a/photoviewer/src/com/android/ex/photo/util/ImageUtils.java b/photoviewer/src/com/android/ex/photo/util/ImageUtils.java index 8564457..d852d65 100644 --- a/photoviewer/src/com/android/ex/photo/util/ImageUtils.java +++ b/photoviewer/src/com/android/ex/photo/util/ImageUtils.java @@ -83,7 +83,7 @@ public class ImageUtils { * @param uri The local URI * @param maxSize The maximum size (either width or height) * - * @return The new bitmap + * @return The new bitmap or null */ public static Bitmap createLocalBitmap(ContentResolver resolver, Uri uri, int maxSize) { InputStream inputStream = null; -- cgit v1.2.3