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

Commit d7a19828 authored by Bharatt Kukreja's avatar Bharatt Kukreja Committed by Automerger Merge Worker
Browse files

Merge "Camera: Hide AUTO mode in autoframing." into udc-dev am: a19952dc 

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



Change-Id: I37201c971798fd04016cf29c1455a47dc6aa1403
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 342f9fbf a19952dc

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -18765,7 +18765,6 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_AF_TRIGGER_CANCEL = 2; // 0x2

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

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

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

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -3285,6 +3285,7 @@ public abstract class CameraMetadata<TKey> { 
    /**

     * <p>Automatically select ON or OFF based on the system level preferences.</p>

     * @see CaptureRequest#CONTROL_AUTOFRAMING

     * @hide

     */

    public static final int CONTROL_AUTOFRAMING_AUTO = 2;

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

+0 −2
Original line number Diff line number Diff line
@@ -2532,7 +2532,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <ul>

     *   <li>{@link #CONTROL_AUTOFRAMING_OFF OFF}</li>

     *   <li>{@link #CONTROL_AUTOFRAMING_ON ON}</li>

     *   <li>{@link #CONTROL_AUTOFRAMING_AUTO AUTO}</li>

     * </ul>

     *

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
@@ -2545,7 +2544,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * @see CaptureRequest#SCALER_CROP_REGION

     * @see #CONTROL_AUTOFRAMING_OFF

     * @see #CONTROL_AUTOFRAMING_ON

     * @see #CONTROL_AUTOFRAMING_AUTO

     */

    @PublicKey

    @NonNull

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

+0 −2
Original line number Diff line number Diff line
@@ -2736,7 +2736,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <ul>

     *   <li>{@link #CONTROL_AUTOFRAMING_OFF OFF}</li>

     *   <li>{@link #CONTROL_AUTOFRAMING_ON ON}</li>

     *   <li>{@link #CONTROL_AUTOFRAMING_AUTO AUTO}</li>

     * </ul>

     *

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
@@ -2749,7 +2748,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * @see CaptureRequest#SCALER_CROP_REGION

     * @see #CONTROL_AUTOFRAMING_OFF

     * @see #CONTROL_AUTOFRAMING_ON

     * @see #CONTROL_AUTOFRAMING_AUTO

     */

    @PublicKey

    @NonNull