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

Commit 5e225fc9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Docs fix for getSessionCharacteristics" into main

parents 9aa24659 e5770053

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

+5 −2
Original line number Diff line number Diff line
@@ -558,8 +558,11 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * on a particular SessionConfiguration.</p>

     *

     * @return List of CameraCharacteristic keys containing characterisitics specific to a session

     * configuration. For Android 15, this list only contains CONTROL_ZOOM_RATIO_RANGE and

     * SCALER_AVAILABLE_MAX_DIGITAL_ZOOM.

     * configuration. If {@link #INFO_SESSION_CONFIGURATION_QUERY_VERSION} is

     * {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, then this list will only contain

     * CONTROL_ZOOM_RATIO_RANGE and SCALER_AVAILABLE_MAX_DIGITAL_ZOOM

     *

     * @see INFO_SESSION_CONFIGURATION_QUERY_VERSION

     */

    @NonNull

    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)

core/java/android/hardware/camera2/CameraDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ public abstract class CameraDevice implements AutoCloseable { 
         * <p>Other than that, the characteristics returned here can be used in the same way as

         * those returned from {@link CameraManager#getCameraCharacteristics}.</p>

         *

         * @param sessionConfig : The session configuration for which characteristics are fetched.

         * @param sessionConfig The session configuration for which characteristics are fetched.

         * @return CameraCharacteristics specific to a given session configuration.

         *

         * @throws IllegalArgumentException      if the session configuration is invalid