diff options
| author | Danesh M <daneshm90@gmail.com> | 2014-02-06 00:45:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-02-06 00:45:03 +0000 |
| commit | a3b023c89cdac39d2d7b68e5a5652175114b6348 (patch) | |
| tree | f96c85de5f1216c882e3587f20d10b1108a00d83 | |
| parent | abb3d544632bb391121c39b174b19c0826b3b231 (diff) | |
| parent | 1f2d0867d5761ca4c0acdb93c59772e56b584530 (diff) | |
| download | android_packages_apps_Trebuchet-a3b023c89cdac39d2d7b68e5a5652175114b6348.tar.gz android_packages_apps_Trebuchet-a3b023c89cdac39d2d7b68e5a5652175114b6348.tar.bz2 android_packages_apps_Trebuchet-a3b023c89cdac39d2d7b68e5a5652175114b6348.zip | |
Merge "Trebuchet : Wallpaper picker check if cursor null" into cm-11.0
| -rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 1dd4db7e4..d1c616028 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -494,12 +494,14 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { 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.moveToFirst()) { + int id = cursor.getInt(0); + thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), + id, MediaStore.Images.Thumbnails.MINI_KIND, null); + } + cursor.close(); } - cursor.close(); return thumb; } |