diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-21 08:29:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-21 08:29:50 -0700 |
| commit | ec2dbc38f16b0bb63794891e1198c38e385712b5 (patch) | |
| tree | b71efa61dd52754fc345f9ba6e37ac8824588b62 /src/com/android/camera/util/CameraUtil.java | |
| parent | 53bf4e0e116eefba3792b36e683c848bc1b22d01 (diff) | |
| parent | 7ce697009dd1d29154a38bf78f37d6a8e9232c8e (diff) | |
| download | android_packages_apps_Snap-ec2dbc38f16b0bb63794891e1198c38e385712b5.tar.gz android_packages_apps_Snap-ec2dbc38f16b0bb63794891e1198c38e385712b5.tar.bz2 android_packages_apps_Snap-ec2dbc38f16b0bb63794891e1198c38e385712b5.zip | |
Merge "SnapdragonCamera: Pictures were rotated when the device is in flat position" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/util/CameraUtil.java')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index eb237b8a4..fb15f1c5d 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -844,13 +844,14 @@ public class CameraUtil { // See android.hardware.Camera.Parameters.setRotation for // documentation. int rotation = 0; - if (orientation != OrientationEventListener.ORIENTATION_UNKNOWN) { - CameraInfo info = CameraHolder.instance().getCameraInfo()[cameraId]; - if (info.facing == CameraInfo.CAMERA_FACING_FRONT) { - rotation = (info.orientation - orientation + 360) % 360; - } else { // back-facing camera - rotation = (info.orientation + orientation) % 360; - } + if (orientation == OrientationEventListener.ORIENTATION_UNKNOWN) { + orientation = 0; + } + CameraInfo info = CameraHolder.instance().getCameraInfo()[cameraId]; + if (info.facing == CameraInfo.CAMERA_FACING_FRONT) { + rotation = (info.orientation - orientation + 360) % 360; + } else { // back-facing camera + rotation = (info.orientation + orientation) % 360; } return rotation; } |