commit c8d31ff228511d815aa8b46d5bd24c6cc8183333
author Adam Cohen <adamcohen@google.com> Thu Jun 12 12:29:50 2014 -0700
committer Adam Cohen <adamcohen@google.com> Thu Jun 12 12:37:55 2014 -0700
tree 0de7a63406c99de25bea224da9b76fa86c2218fa
parent 76308c3b6222d98e4dbc0fbabd21ad9b57f27e88

Add null check for empty MediaStore cursor

issue 15397853

Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8

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

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 232c6d1..b5e34cf 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -674,13 +674,16 @@
                 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;
     }