From c8d31ff228511d815aa8b46d5bd24c6cc8183333 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Thu, 12 Jun 2014 12:29:50 -0700 Subject: Add null check for empty MediaStore cursor issue 15397853 Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8 --- .../src/com/android/launcher3/WallpaperPickerActivity.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'WallpaperPicker/src') diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java index 232c6d167..b5e34cfe7 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java @@ -674,13 +674,16 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { new String[] { MediaStore.Images.ImageColumns._ID, MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, MediaStore.Images.ImageColumns.DATE_TAKEN + " DESC LIMIT 1"); + Bitmap thumb = null; - if (cursor.moveToNext()) { - int id = cursor.getInt(0); - thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), - id, MediaStore.Images.Thumbnails.MINI_KIND, null); + if (cursor != null) { + if (cursor.moveToNext()) { + int id = cursor.getInt(0); + thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), + id, MediaStore.Images.Thumbnails.MINI_KIND, null); + } + cursor.close(); } - cursor.close(); return thumb; } -- cgit v1.2.3