Add null check for empty MediaStore cursor
issue 15397853 Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8
This commit is contained in:
@@ -674,13 +674,16 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
|
|||||||
new String[] { MediaStore.Images.ImageColumns._ID,
|
new String[] { MediaStore.Images.ImageColumns._ID,
|
||||||
MediaStore.Images.ImageColumns.DATE_TAKEN},
|
MediaStore.Images.ImageColumns.DATE_TAKEN},
|
||||||
null, null, MediaStore.Images.ImageColumns.DATE_TAKEN + " DESC LIMIT 1");
|
null, null, MediaStore.Images.ImageColumns.DATE_TAKEN + " DESC LIMIT 1");
|
||||||
|
|
||||||
Bitmap thumb = null;
|
Bitmap thumb = null;
|
||||||
if (cursor.moveToNext()) {
|
if (cursor != null) {
|
||||||
int id = cursor.getInt(0);
|
if (cursor.moveToNext()) {
|
||||||
thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(),
|
int id = cursor.getInt(0);
|
||||||
id, MediaStore.Images.Thumbnails.MINI_KIND, null);
|
thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(),
|
||||||
|
id, MediaStore.Images.Thumbnails.MINI_KIND, null);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
}
|
}
|
||||||
cursor.close();
|
|
||||||
return thumb;
|
return thumb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user