Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc49882 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Android (Google) Code Review
Browse files

Merge "Camera: Update JPEG_ORIENTATION doc to clarify Image behavior" into main

parents 05ec7771 a086ac13

core/java/android/hardware/camera2/CaptureRequest.java

+3 −1
Original line number Diff line number Diff line
@@ -2800,7 +2800,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * upright.</p>

     * <p>Camera devices may either encode this value into the JPEG EXIF header, or

     * rotate the image data to match this orientation. When the image data is rotated,

     * the thumbnail data will also be rotated.</p>

     * the thumbnail data will also be rotated. Additionally, in the case where the image data

     * is rotated, {@link android.media.Image#getWidth } and {@link android.media.Image#getHeight }

     * will not be updated to reflect the height and width of the rotated image.</p>

     * <p>Note that this orientation is relative to the orientation of the camera sensor, given

     * by {@link CameraCharacteristics#SENSOR_ORIENTATION android.sensor.orientation}.</p>

     * <p>To translate from the device orientation given by the Android sensor APIs for camera

core/java/android/hardware/camera2/CaptureResult.java

+3 −1
Original line number Diff line number Diff line
@@ -3091,7 +3091,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * upright.</p>

     * <p>Camera devices may either encode this value into the JPEG EXIF header, or

     * rotate the image data to match this orientation. When the image data is rotated,

     * the thumbnail data will also be rotated.</p>

     * the thumbnail data will also be rotated. Additionally, in the case where the image data

     * is rotated, {@link android.media.Image#getWidth } and {@link android.media.Image#getHeight }

     * will not be updated to reflect the height and width of the rotated image.</p>

     * <p>Note that this orientation is relative to the orientation of the camera sensor, given

     * by {@link CameraCharacteristics#SENSOR_ORIENTATION android.sensor.orientation}.</p>

     * <p>To translate from the device orientation given by the Android sensor APIs for camera