summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-09 00:28:41 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-09 00:28:41 -0800
commitcbd9bb85751ea5233f5c902a5b2baf8635d52a0b (patch)
tree4137418c016f3bfe584f422ac1b925f72ad18b2c /src/com
parent25dee8bc2d2fc082e11649b3f226e0908dd92ad6 (diff)
parentcd17bf86578cad439013b62671158b5f9b1c9943 (diff)
downloadandroid_packages_apps_Snap-cbd9bb85751ea5233f5c902a5b2baf8635d52a0b.tar.gz
android_packages_apps_Snap-cbd9bb85751ea5233f5c902a5b2baf8635d52a0b.tar.bz2
android_packages_apps_Snap-cbd9bb85751ea5233f5c902a5b2baf8635d52a0b.zip
Merge "SnapdragonCamera: Picture flip fix in zsl mode"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/PhotoModule.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 32b6a941e..151388dd3 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3097,12 +3097,10 @@ public class PhotoModule
} else if (video_flip_value == 2) {
video_flip_value = 1;
}
- if (mSnapshotMode != CameraInfo.CAMERA_SUPPORT_MODE_ZSL) {
- if (picture_flip_value == 1) {
- picture_flip_value = 2;
- } else if (picture_flip_value == 2) {
- picture_flip_value = 1;
- }
+ if (picture_flip_value == 1) {
+ picture_flip_value = 2;
+ } else if (picture_flip_value == 2) {
+ picture_flip_value = 1;
}
}
String preview_flip = CameraUtil.getFilpModeString(preview_flip_value);