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

Commit ecc5c8a4 authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Fix availableTestPatternModes type"

parents 1c97a526 a486624a

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

+2 −2
Original line number Diff line number Diff line
@@ -1093,8 +1093,8 @@ public final class CameraCharacteristics extends CameraMetadata { 
     *

     * @see CaptureRequest#SENSOR_TEST_PATTERN_MODE

     */

    public static final Key<Byte> SENSOR_AVAILABLE_TEST_PATTERN_MODES =

            new Key<Byte>("android.sensor.availableTestPatternModes", byte.class);

    public static final Key<int[]> SENSOR_AVAILABLE_TEST_PATTERN_MODES =

            new Key<int[]>("android.sensor.availableTestPatternModes", int[].class);



    /**

     * <p>Which face detection modes are available,

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

+5 −2
Original line number Diff line number Diff line
@@ -1002,8 +1002,11 @@ public abstract class CameraMetadata { 
     * controls; the camera device will ignore those settings while

     * USE_SCENE_MODE is active (except for FACE_PRIORITY

     * scene mode). Other control entries are still active.

     * This setting can only be used if availableSceneModes !=

     * UNSUPPORTED</p>

     * This setting can only be used if scene mode is supported

     * (i.e. {@link CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES android.control.availableSceneModes} contain some modes

     * other than DISABLED).</p>

     *

     * @see CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES

     * @see CaptureRequest#CONTROL_MODE

     */

    public static final int CONTROL_MODE_USE_SCENE_MODE = 2;