summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorKetut Putu Kumajaya <ketut.kumajaya@gmail.com>2016-04-25 22:46:06 +0700
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:51 -0700
commit32018b49ce4caf794b46ed07d66df24015cbdeb3 (patch)
treef47c25cff9fd2140b2f17ae0e717f0800a47dc1f /src/com
parentff0dfd0897b24a15d31f7dc776fee9c1b3ec3c7f (diff)
downloadandroid_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
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java16
1 files changed, 15 insertions, 1 deletions
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