Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Camera: Hide AUTO mode in autoframing.

Browse Source 
AUTO not needed anymore.

Bug: 234004829
Test: All existing CTS tests pass.
Change-Id: I0181a766bd58d736f4373db0e6c98a646bb8e6e0
This commit is contained in:
Bharatt Kukreja
2023-03-17 04:11:50 +00:00
parent 2a523ecc09
commit 6fabb7efc3
4 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -18768,7 +18768,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

1
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -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;

2
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -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

2
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -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