summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKetut Putu Kumajaya <ketut.kumajaya@gmail.com>2016-04-25 22:46:06 +0700
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:49 +0200
commit9296228b43c28cbee34b6efeb9dc5aa52ce86cb4 (patch)
treee1b1cb8262d9660e98449fbccfa7ab42cc9d3f0b /src
parent2762f79c43ca558c8abcc3b340ffb8c18b3800ba (diff)
downloadandroid_packages_apps_Snap-9296228b43c28cbee34b6efeb9dc5aa52ce86cb4.tar.gz
android_packages_apps_Snap-9296228b43c28cbee34b6efeb9dc5aa52ce86cb4.tar.bz2
android_packages_apps_Snap-9296228b43c28cbee34b6efeb9dc5aa52ce86cb4.zip
Snap: Support override maker and model exif tag
Camera HAL not always return proper values Change-Id: Id81fe40ac84b0ffb70560e55077d90544139e463
Diffstat (limited to 'src')
-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