1 files changed, 11 insertions, 1 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 3704f59..1aac446 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -489,11 +489,21 @@ class AndroidCameraAgentImpl extends CameraAgent {
                         mCamera.setDisplayOrientation(
                                 mCharacteristics.getPreviewOrientation(msg.arg1));
                         // Only set the JPEG capture orientation if requested to do so; otherwise,
-                        // capture in the sensor's physical orientation
+                        // capture in the sensor's physical orientation. (e.g., JPEG rotation is
+                        // necessary in auto-rotate mode.
                         Parameters parameters = mParameterCache.getBlocking();
                         parameters.setRotation(
                                 msg.arg2 > 0 ? mCharacteristics.getJpegOrientation(msg.arg1) : 0);
                         mCamera.setParameters(parameters);
+                        mParameterCache.invalidate();
+                        break;
+                    }
+
+                    case CameraActions.SET_JPEG_ORIENTATION: {
+                        Parameters parameters = mParameterCache.getBlocking();
+                        parameters.setRotation(msg.arg1);
+                        mCamera.setParameters(parameters);
+                        mParameterCache.invalidate();
                         break;
                     }