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

Commit d928b8c9 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera3: Update optical stabilization tags."

parents ae7d2f19 00849b3a

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

+7 −2
Original line number Diff line number Diff line
@@ -329,8 +329,13 @@ public final class CameraCharacteristics extends CameraMetadata { 
            new Key<float[]>("android.lens.info.availableFocalLengths", float[].class);



    /**

     * <p>List of supported optical image

     * stabilization modes</p>

     * <p>List containing a subset of the optical image

     * stabilization (OIS) modes specified in

     * {@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode}.</p>

     * <p>If OIS is not implemented for a given camera device, this should

     * contain only OFF.</p>

     *

     * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE

     */

    public static final Key<byte[]> LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION =

            new Key<byte[]>("android.lens.info.availableOpticalStabilization", byte[].class);

core/java/android/hardware/camera2/CameraMetadata.java

+2 −0
Original line number Diff line number Diff line
@@ -982,11 +982,13 @@ public abstract class CameraMetadata { 
    //



    /**

     * <p>Optical stabilization is unavailable.</p>

     * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE

     */

    public static final int LENS_OPTICAL_STABILIZATION_MODE_OFF = 0;



    /**

     * <p>Optical stabilization is enabled.</p>

     * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE

     */

    public static final int LENS_OPTICAL_STABILIZATION_MODE_ON = 1;

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

+8 −3
Original line number Diff line number Diff line
@@ -975,9 +975,14 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
            new Key<Float>("android.lens.focusDistance", float.class);



    /**

     * <p>Whether optical image stabilization is

     * enabled.</p>

     * <p>Will not be supported on most devices.</p>

     * <p>Sets whether the camera device uses optical image stabilization (OIS)

     * when capturing images.</p>

     * <p>OIS is used to compensate for motion blur due to small movements of

     * the camera during capture. Unlike digital image stabilization, OIS makes

     * use of mechanical elements to stabilize the camera sensor, and thus

     * allows for longer exposure times before camera shake becomes

     * apparent.</p>

     * <p>This is not expected to be supported on most devices.</p>

     * @see #LENS_OPTICAL_STABILIZATION_MODE_OFF

     * @see #LENS_OPTICAL_STABILIZATION_MODE_ON

     */

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

+8 −3
Original line number Diff line number Diff line
@@ -1133,9 +1133,14 @@ public final class CaptureResult extends CameraMetadata { 
            new Key<float[]>("android.lens.focusRange", float[].class);



    /**

     * <p>Whether optical image stabilization is

     * enabled.</p>

     * <p>Will not be supported on most devices.</p>

     * <p>Sets whether the camera device uses optical image stabilization (OIS)

     * when capturing images.</p>

     * <p>OIS is used to compensate for motion blur due to small movements of

     * the camera during capture. Unlike digital image stabilization, OIS makes

     * use of mechanical elements to stabilize the camera sensor, and thus

     * allows for longer exposure times before camera shake becomes

     * apparent.</p>

     * <p>This is not expected to be supported on most devices.</p>

     * @see #LENS_OPTICAL_STABILIZATION_MODE_OFF

     * @see #LENS_OPTICAL_STABILIZATION_MODE_ON

     */