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

Commit 307180a1 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix a doc typo" into sc-dev am: 6001ff0c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921466

Change-Id: I45ca4878d8401fe86a0e4954f6a77bf4dfe760de
parents 1e24dab1 6001ff0c

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

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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