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

Commit 6c621639 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev

parents a2906cb4 9ea4ae67

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10965,6 +10965,7 @@ package android.hardware.camera2 { 
    field public static final int LENS_FACING_FRONT = 0; // 0x0

    field public static final int LENS_OPTICAL_STABILIZATION_MODE_OFF = 0; // 0x0

    field public static final int LENS_OPTICAL_STABILIZATION_MODE_ON = 1; // 0x1

    field public static final int LENS_STATE_MOVING = 1; // 0x1

    field public static final int LENS_STATE_STATIONARY = 0; // 0x0

    field public static final int NOISE_REDUCTION_MODE_FAST = 1; // 0x1

    field public static final int NOISE_REDUCTION_MODE_HIGH_QUALITY = 2; // 0x2

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

+5 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,11 @@ public abstract class CameraMetadata { 
     */

    public static final int LENS_STATE_STATIONARY = 0;



    /**

     * @see CaptureResult#LENS_STATE

     */

    public static final int LENS_STATE_MOVING = 1;



    //

    // Enumeration values for CaptureResult#STATISTICS_SCENE_FLICKER

    //

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

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ public final class CaptureResult extends CameraMetadata { 
     * Current lens status

     * </p>

     * @see #LENS_STATE_STATIONARY

     * @see #LENS_STATE_MOVING

     */

    public static final Key<Integer> LENS_STATE =

            new Key<Integer>("android.lens.state", int.class);