diff options
| author | Mark Wei <markwei@google.com> | 2012-08-30 11:52:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 11:52:59 -0700 |
| commit | f688fc95529aae7aab75f631a9cffce9d20017f2 (patch) | |
| tree | 68e2b074510c178b52710ea146831285739c99c7 /photoviewer | |
| parent | 97992e595ffb8eef8a6a12609cc4da368d4e0f6f (diff) | |
| parent | da79838d619c3ae45a34ef45964c562331cf30da (diff) | |
| download | android_frameworks_ex-f688fc95529aae7aab75f631a9cffce9d20017f2.tar.gz android_frameworks_ex-f688fc95529aae7aab75f631a9cffce9d20017f2.tar.bz2 android_frameworks_ex-f688fc95529aae7aab75f631a9cffce9d20017f2.zip | |
am da79838d: am a7e22413: Fix NullPointerException when tapping attachment.
* commit 'da79838d619c3ae45a34ef45964c562331cf30da':
Fix NullPointerException when tapping attachment.
Diffstat (limited to 'photoviewer')
| -rw-r--r-- | photoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java | 4 | ||||
| -rw-r--r-- | 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<Bitmap> { 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;
|