diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-08-10 17:33:59 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-08-10 17:33:59 -0700 |
| commit | fc4700c0e9f1804d4b61bd586f066172a25c7035 (patch) | |
| tree | 5ce45edf928d203fd873ed00c7a5eeda56bdef7b | |
| parent | 1a1cb07982f574a59cd84b0501770da97accad89 (diff) | |
| download | android_packages_apps_Gallery2-fc4700c0e9f1804d4b61bd586f066172a25c7035.tar.gz android_packages_apps_Gallery2-fc4700c0e9f1804d4b61bd586f066172a25c7035.tar.bz2 android_packages_apps_Gallery2-fc4700c0e9f1804d4b61bd586f066172a25c7035.zip | |
Fix crash when we can't load the exif
Change-Id: I014518f727128676e9189d19c9e1073daeb2ee4b
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index 30a0bfadc..3877c4980 100644 --- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java +++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java @@ -81,6 +81,9 @@ public final class ImageLoader { public static String getLocalPathFromUri(Context context, Uri uri) { Cursor cursor = context.getContentResolver().query(uri, new String[]{MediaStore.Images.Media.DATA}, null, null, null); + if (cursor == null) { + return null; + } int index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); cursor.moveToFirst(); return cursor.getString(index); |