diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/photoeditor/BitmapUtils.java | 5 | ||||
| -rw-r--r-- | src/com/android/gallery3d/photoeditor/SaveCopyTask.java | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/photoeditor/BitmapUtils.java b/src/com/android/gallery3d/photoeditor/BitmapUtils.java index 5211a8379..ef01e4868 100644 --- a/src/com/android/gallery3d/photoeditor/BitmapUtils.java +++ b/src/com/android/gallery3d/photoeditor/BitmapUtils.java @@ -126,11 +126,14 @@ public class BitmapUtils { private int getOrientation(Uri uri) { int orientation = 0; - Cursor cursor = context.getContentResolver().query(uri, IMAGE_PROJECTION, null, null, null); + Cursor cursor = null; try { + cursor = context.getContentResolver().query(uri, IMAGE_PROJECTION, null, null, null); if ((cursor != null) && cursor.moveToNext()) { orientation = cursor.getInt(INDEX_ORIENTATION); } + } catch (Exception e) { + // Ignore error for no orientation column; just use the default orientation value 0. } finally { if (cursor != null) { cursor.close(); diff --git a/src/com/android/gallery3d/photoeditor/SaveCopyTask.java b/src/com/android/gallery3d/photoeditor/SaveCopyTask.java index e43959e94..d46756335 100644 --- a/src/com/android/gallery3d/photoeditor/SaveCopyTask.java +++ b/src/com/android/gallery3d/photoeditor/SaveCopyTask.java @@ -118,14 +118,16 @@ public class SaveCopyTask extends AsyncTask<Bitmap, Void, Uri> { double longitude = 0f; ContentResolver contentResolver = context.getContentResolver(); - Cursor cursor = contentResolver.query( - sourceUri, IMAGE_PROJECTION, null, null, null); + Cursor cursor = null; try { + cursor = contentResolver.query(sourceUri, IMAGE_PROJECTION, null, null, null); if ((cursor != null) && cursor.moveToNext()) { dateTaken = cursor.getLong(INDEX_DATE_TAKEN); latitude = cursor.getDouble(INDEX_LATITUDE); longitude = cursor.getDouble(INDEX_LONGITUDE); } + } catch (Exception e) { + // Ignore error for lacking property columns from the source. } finally { if (cursor != null) { cursor.close(); |