diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-20 01:39:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-20 01:39:39 -0700 |
| commit | faab026a77b5a7943161841d0c28d3ba03baf85d (patch) | |
| tree | f05c1298a3799a38711116783b0e9c53db418167 | |
| parent | fa90c56c1862fb0ce44181b357a2fb35e18dc5dd (diff) | |
| parent | 3bca2c0ffd2c3cd1cbc6d85109438193704d3bfe (diff) | |
| download | android_packages_apps_Snap-faab026a77b5a7943161841d0c28d3ba03baf85d.tar.gz android_packages_apps_Snap-faab026a77b5a7943161841d0c28d3ba03baf85d.tar.bz2 android_packages_apps_Snap-faab026a77b5a7943161841d0c28d3ba03baf85d.zip | |
Merge "SnapdragonCamera: Fix picture orientation" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index feef31fec..c053655f5 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -863,9 +863,7 @@ public class CaptureModule implements CameraModule, PhotoController, captureBuilder = mCameraDevice[id].createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE); } - // Orientation - int rotation = mActivity.getWindowManager().getDefaultDisplay().getRotation(); - captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, CameraUtil.getJpegRotation(id, rotation)); + captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, CameraUtil.getJpegRotation(id, mOrientation)); captureBuilder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO); captureBuilder.addTarget(getPreviewSurface(id)); captureBuilder.set(CaptureRequest.CONTROL_AF_MODE, mControlAFMode); |