Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d31ff2 authored by Adam Cohen's avatar Adam Cohen
Browse files

Add null check for empty MediaStore cursor 

issue 15397853

Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8
parent 76308c3b

WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java

+8 −5
Original line number Diff line number Diff line
@@ -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 != null) {

            if (cursor.moveToNext()) {

                int id = cursor.getInt(0);

                thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(),

                        id, MediaStore.Images.Thumbnails.MINI_KIND, null);

            }

            cursor.close();

        }

        return thumb;

    }