summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ravneet Dhanjal <rdhanjal@google.com> 2024-01-31 21:31:17 +0000
committer Ravneet Dhanjal <rdhanjal@google.com> 2024-01-31 22:15:37 +0000
commita086ac13a2e03ca783813a50ba06a670c7e73036 (patch)
treeede5e480077a15229b1447c90362d488c89562ae
parentcb1f505968cf66c70c9a2f0b9ee3a3da552f4f4f (diff)
Camera: Update JPEG_ORIENTATION doc to clarify Image behavior
Test: CTS Bug: 322420249 Change-Id: I0b680e09b9c497a64d67333e0fa7fa623b98de56
-rw-r--r--core/java/android/hardware/camera2/CaptureRequest.java4
-rw-r--r--core/java/android/hardware/camera2/CaptureResult.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java
index ded96a23e11e..7ce5edce5e42 100644
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/core/java/android/hardware/camera2/CaptureRequest.java
@@ -2783,7 +2783,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
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 1d26d69a58b9..c1526fe38449 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -3090,7 +3090,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