diff options
author | Ketut Putu Kumajaya <ketut.kumajaya@gmail.com> | 2016-04-25 22:46:06 +0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:51 -0700 |
commit | 32018b49ce4caf794b46ed07d66df24015cbdeb3 (patch) | |
tree | f47c25cff9fd2140b2f17ae0e717f0800a47dc1f | |
parent | ff0dfd0897b24a15d31f7dc776fee9c1b3ec3c7f (diff) | |
download | android_packages_apps_Snap-32018b49ce4caf794b46ed07d66df24015cbdeb3.tar.gz android_packages_apps_Snap-32018b49ce4caf794b46ed07d66df24015cbdeb3.tar.bz2 android_packages_apps_Snap-32018b49ce4caf794b46ed07d66df24015cbdeb3.zip |
Snap: Support override maker and model exif tag
Camera HAL not always return proper values
Change-Id: Id81fe40ac84b0ffb70560e55077d90544139e463
-rw-r--r-- | res/values/config.xml | 3 | ||||
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index fb8e18969..520f35786 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -58,4 +58,7 @@ <!-- Enable support for LGE HDR --> <bool name="lge_hdr_mode">false</bool> + + <!-- Set this to true to use device manufacturer and model for exif --> + <bool name="override_maker_and_model_tag">false</bool> </resources> diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a99541084..b99a4640c 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1328,6 +1328,21 @@ public class PhotoModule mUI.setSwipingEnabled(true); } + ExifInterface exif = Exif.getExif(jpegData); + boolean overrideMakerAndModelTag = false; + if (mApplicationContext != null) { + overrideMakerAndModelTag = + mApplicationContext.getResources() + .getBoolean(R.bool.override_maker_and_model_tag); + } + + if (overrideMakerAndModelTag) { + ExifTag maker = exif.buildTag(ExifInterface.TAG_MAKE, Build.MANUFACTURER); + exif.setTag(maker); + ExifTag model = exif.buildTag(ExifInterface.TAG_MODEL, Build.MODEL); + exif.setTag(model); + } + mReceivedSnapNum = mReceivedSnapNum + 1; mJpegPictureCallbackTime = System.currentTimeMillis(); if(mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL) { @@ -1412,7 +1427,6 @@ public class PhotoModule } } if (!mRefocus || (mRefocus && mReceivedSnapNum == 7)) { - ExifInterface exif = Exif.getExif(jpegData); int orientation = Exif.getOrientation(exif); if(mCameraId == CameraHolder.instance().getFrontCameraId()) { IconListPreference selfieMirrorPref = (IconListPreference) mPreferenceGroup |