diff options
| author | Ray Chen <raychen@google.com> | 2011-08-19 12:35:29 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2011-08-25 09:31:38 +0800 |
| commit | 6b7d527695cfbe5681865654bf078358f5ca687f (patch) | |
| tree | 26f30d231ced627e7f2dc60dd7777ebc97cf8927 /src/com/android/gallery3d/provider | |
| parent | 90464f2241c2f0fcd1aee23ccff7255ca4dc4242 (diff) | |
| download | android_packages_apps_Snap-6b7d527695cfbe5681865654bf078358f5ca687f.tar.gz android_packages_apps_Snap-6b7d527695cfbe5681865654bf078358f5ca687f.tar.bz2 android_packages_apps_Snap-6b7d527695cfbe5681865654bf078358f5ca687f.zip | |
Fix 5027908 Crash in MMS while attaching a picture from Picasa
Change-Id: I7f67a7da5191f0ec8fbe3fc3c2d79e54394c4715
Diffstat (limited to 'src/com/android/gallery3d/provider')
| -rw-r--r-- | src/com/android/gallery3d/provider/GalleryProvider.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/provider/GalleryProvider.java b/src/com/android/gallery3d/provider/GalleryProvider.java index d1dccc574..4068d460d 100644 --- a/src/com/android/gallery3d/provider/GalleryProvider.java +++ b/src/com/android/gallery3d/provider/GalleryProvider.java @@ -46,6 +46,17 @@ import java.io.OutputStream; public class GalleryProvider extends ContentProvider { private static final String TAG = "GalleryProvider"; + public static final String AUTHORITY = "com.android.gallery3d.provider"; + public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY); + private static final String[] SUPPORTED_PICASA_COLUMNS = { + ImageColumns.DISPLAY_NAME, + ImageColumns.SIZE, + ImageColumns.MIME_TYPE, + ImageColumns.DATE_TAKEN, + ImageColumns.LATITUDE, + ImageColumns.LONGITUDE, + ImageColumns.ORIENTATION}; + private DataManager mDataManager; private DownloadCache mDownloadCache; private static Uri sBaseUri; @@ -151,6 +162,7 @@ public class GalleryProvider extends ContentProvider { private Cursor queryPicasaItem(MediaObject image, String[] projection, String selection, String[] selectionArgs, String sortOrder) { + if (projection == null) projection = SUPPORTED_PICASA_COLUMNS; Object[] columnValues = new Object[projection.length]; double latitude = PicasaSource.getLatitude(image); double longitude = PicasaSource.getLongitude(image); |