diff options
| author | 2021-03-18 23:59:21 +0000 | |
|---|---|---|
| committer | 2021-03-18 23:59:21 +0000 | |
| commit | 6001ff0cd1ccb32afcc773a310e68d05c9c4cab4 (patch) | |
| tree | 817eac076ee8aa1ec57482470f22b7c131e7c471 | |
| parent | 3f6e6e2ef807c8c55dcc42db5d0e0fb0d7589cbd (diff) | |
| parent | 2146f286b1b8644775c834e1e818ab81447b8e86 (diff) | |
Merge "Camera: Fix a doc typo" into sc-dev
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 157e333e497b..9ac2ff57ad7b 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -3345,7 +3345,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p>A control for selecting whether optical stabilization (OIS) position * information is included in output result metadata.</p> * <p>Since optical image stabilization generally involves motion much faster than the duration - * of individualq image exposure, multiple OIS samples can be included for a single capture + * of individual image exposure, multiple OIS samples can be included for a single capture * result. For example, if the OIS reporting operates at 200 Hz, a typical camera operating * at 30fps may have 6-7 OIS samples per capture result. This information can be combined * with the rolling shutter skew to account for lens motion during image exposure in diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index c0eb06804d3e..e7457e714f43 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -4635,7 +4635,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>A control for selecting whether optical stabilization (OIS) position * information is included in output result metadata.</p> * <p>Since optical image stabilization generally involves motion much faster than the duration - * of individualq image exposure, multiple OIS samples can be included for a single capture + * of individual image exposure, multiple OIS samples can be included for a single capture * result. For example, if the OIS reporting operates at 200 Hz, a typical camera operating * at 30fps may have 6-7 OIS samples per capture result. This information can be combined * with the rolling shutter skew to account for lens motion during image exposure in |