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

Commit d8e661d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Adjust documentation and comments for insensitive language."... 

Merge "Camera: Adjust documentation and comments for insensitive language." into rvc-dev am: 8b3783c8

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

Change-Id: Iafc817860e7c6363033bd017e954d93b41744c31
parents 34fd2fe8 8b3783c8

core/java/android/hardware/camera2/CameraCharacteristics.java

+5 −4
Original line number Diff line number Diff line
@@ -4086,10 +4086,11 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    /**

     * <p>The accuracy of frame timestamp synchronization between physical cameras</p>

     * <p>The accuracy of the frame timestamp synchronization determines the physical cameras'

     * ability to start exposure at the same time. If the sensorSyncType is CALIBRATED,

     * the physical camera sensors usually run in master-slave mode so that their shutter

     * time is synchronized. For APPROXIMATE sensorSyncType, the camera sensors usually run in

     * master-master mode, and there could be offset between their start of exposure.</p>

     * ability to start exposure at the same time. If the sensorSyncType is CALIBRATED, the

     * physical camera sensors usually run in leader/follower mode where one sensor generates a

     * timing signal for the other, so that their shutter time is synchronized. For APPROXIMATE

     * sensorSyncType, the camera sensors usually run in leader/leader mode, where both sensors

     * use their own timing generator, and there could be offset between their start of exposure.</p>

     * <p>In both cases, all images generated for a particular capture request still carry the same

     * timestamps, so that they can be used to look up the matching frame number and

     * onCaptureStarted callback.</p>

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

+2 −2
Original line number Diff line number Diff line
@@ -477,8 +477,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * A constrained high speed request list contains some constrained high speed capture requests

     * with certain interleaved pattern that is suitable for high speed preview/video streaming. An

     * active constrained high speed capture session only accepts constrained high speed request

     * lists.  This method can be used to do the sanity check when a constrained high speed capture

     * session receives a request list via {@link CameraCaptureSession#setRepeatingBurst} or

     * lists.  This method can be used to do the correctness check when a constrained high speed

     * capture session receives a request list via {@link CameraCaptureSession#setRepeatingBurst} or

     * {@link CameraCaptureSession#captureBurst}.  </p>

     *

     *