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

Commit 5bed54d6 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Make settings override keys optional 

If the camera device doesn't support settings override, the value
of the key will be null.

Test: Build
Bug: 239822823
Change-Id: I48fc587341c98be1803f34ce7034e5d359c56094
parent e5cecc1b

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

+0 −4
Original line number Diff line number Diff line
@@ -2498,12 +2498,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#CONTROL_AVAILABLE_SETTINGS_OVERRIDES android.control.availableSettingsOverrides}</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     * <p><b>Limited capability</b> -

     * Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CameraCharacteristics#CONTROL_AVAILABLE_SETTINGS_OVERRIDES

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see #CONTROL_SETTINGS_OVERRIDE_OFF

     * @see #CONTROL_SETTINGS_OVERRIDE_ZOOM

     */

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

+0 −4
Original line number Diff line number Diff line
@@ -2702,12 +2702,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#CONTROL_AVAILABLE_SETTINGS_OVERRIDES android.control.availableSettingsOverrides}</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     * <p><b>Limited capability</b> -

     * Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CameraCharacteristics#CONTROL_AVAILABLE_SETTINGS_OVERRIDES

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see #CONTROL_SETTINGS_OVERRIDE_OFF

     * @see #CONTROL_SETTINGS_OVERRIDE_ZOOM

     */