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

Commit ab1dad5e authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Require night extension support for AF and Zoom 

Update the current documentation and require night extension
implementations launching on Android V or newer to support
zoom and AF controls.

Bug: 297083874
Test: Camera CTS
Change-Id: I824a9e4d510373e9898dd853169111e7d40310e6
parent cc9b5056

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+12 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,12 @@ public final class CameraExtensionCharacteristics { 
     * <p>The set returned is not modifiable, so any attempts to modify it will throw

     * a {@code UnsupportedOperationException}.</p>

     *

     * <p>Devices launching on Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}

     * or newer versions are required to support {@link CaptureRequest#CONTROL_AF_MODE},

     * {@link CaptureRequest#CONTROL_AF_REGIONS}, {@link CaptureRequest#CONTROL_AF_TRIGGER},

     * {@link CaptureRequest#CONTROL_ZOOM_RATIO} for

     * {@link CameraExtensionCharacteristics#EXTENSION_NIGHT}.</p>

     *

     * @param extension the extension type

     *

     * @return non-modifiable set of capture keys supported by camera extension session initialized
@@ -1122,6 +1128,12 @@ public final class CameraExtensionCharacteristics { 
     * and the {@link CameraExtensionSession.ExtensionCaptureCallback#onCaptureResultAvailable}

     * callback will not be fired.</p>

     *

     * <p>Devices launching on Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}

     * or newer versions are required to support {@link CaptureResult#CONTROL_AF_MODE},

     * {@link CaptureResult#CONTROL_AF_REGIONS}, {@link CaptureResult#CONTROL_AF_TRIGGER},

     * {@link CaptureResult#CONTROL_AF_STATE}, {@link CaptureResult#CONTROL_ZOOM_RATIO} for

     * {@link CameraExtensionCharacteristics#EXTENSION_NIGHT}.</p>

     *

     * @param extension the extension type

     *

     * @return non-modifiable set of capture result keys supported by camera extension session