summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2016-06-17 08:51:56 -0700
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 22:00:42 +0200
commit1d91e536761468aa753c7be0d16313d5ff10da5e (patch)
treee67c2f832ab30f8700947a17be99841842875b58
parent149fda811f314f38a192d01f1ad68412ed50597d (diff)
downloadandroid_packages_apps_Snap-1d91e536761468aa753c7be0d16313d5ff10da5e.zip
android_packages_apps_Snap-1d91e536761468aa753c7be0d16313d5ff10da5e.tar.gz
android_packages_apps_Snap-1d91e536761468aa753c7be0d16313d5ff10da5e.tar.bz2
CameraNext: Fallback to do copy exif if exif not exist
If exif in jpeg does not exist, rewriteExif will throw IOException instead of returning false. Let's catch it and fallback to the original logic to do a copy instead of in-place replacement. FEIJ-1245 Change-Id: I61b8bd9b9b7c855bff1897c036d948fcd16bb30a
-rw-r--r--src/com/android/camera/exif/ExifInterface.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/exif/ExifInterface.java b/src/com/android/camera/exif/ExifInterface.java
index 3049d26..beacbc0 100644
--- a/src/com/android/camera/exif/ExifInterface.java
+++ b/src/com/android/camera/exif/ExifInterface.java
@@ -1098,7 +1098,16 @@ public class ExifInterface {
throws FileNotFoundException,
IOException {
// Attempt in-place write
- if (!rewriteExif(filename, tags)) {
+ boolean rewriteOkay = false;
+ try {
+ rewriteOkay = rewriteExif(filename, tags);
+ } catch (IOException e) {
+ // If jpeg does not contains exif, rewriteExif
+ // will throw EOF IOException, let's catch
+ // it and fall back to do a copy instead
+ // of in-place replacement.
+ }
+ if (!rewriteOkay) {
// Fall back to doing a copy
ExifData tempData = mData;
mData = new ExifData(DEFAULT_BYTE_ORDER);