diff options
| author | 2015-03-27 21:50:41 +0000 | |
|---|---|---|
| committer | 2015-03-27 21:50:42 +0000 | |
| commit | c889098e4652104b9f9cda457d1c0482cf127b47 (patch) | |
| tree | c0ac61be7c7378878bd3a15d82fddd09e158c22d | |
| parent | 15427f80bb9632ec34f5491f0e9ac2c4f977074e (diff) | |
| parent | d49ebcc3ad3d37d9c37e638db5d308c9c22c30fb (diff) | |
Merge "Camera: codegen doc update"
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 3 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 7569ea5c9059..b8fb8e7aaaa6 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -1541,7 +1541,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * to the camera, that the JPEG picture needs to be rotated by, to be viewed * upright.</p> * <p>Camera devices may either encode this value into the JPEG EXIF header, or - * rotate the image data to match this orientation.</p> + * rotate the image data to match this orientation. When the image data is rotated, + * the thumbnail data will also be rotated.</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, the following diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index b84dc2e0f8b8..e346dc2fa88b 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2230,7 +2230,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * to the camera, that the JPEG picture needs to be rotated by, to be viewed * upright.</p> * <p>Camera devices may either encode this value into the JPEG EXIF header, or - * rotate the image data to match this orientation.</p> + * rotate the image data to match this orientation. When the image data is rotated, + * the thumbnail data will also be rotated.</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, the following |