Add null check for empty MediaStore cursor

issue 15397853

Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8
This commit is contained in:
Adam Cohen
2014-06-12 12:29:50 -07:00
parent 76308c3b62
commit c8d31ff228
@@ -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;
}