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

Commit 7e6f93a6 authored by Bharatt Kukreja's avatar Bharatt Kukreja Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add max digital zoom to session characteristic keys" into main

parents e9f61b65 53098a7a
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -557,13 +557,15 @@ 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.
     * configuration. For Android 15, this list only contains CONTROL_ZOOM_RATIO_RANGE and
     * SCALER_AVAILABLE_MAX_DIGITAL_ZOOM.
     */
    @NonNull
    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)
    public List<CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys() {
        if (mAvailableSessionCharacteristicsKeys == null) {
            mAvailableSessionCharacteristicsKeys = Arrays.asList(CONTROL_ZOOM_RATIO_RANGE);
            mAvailableSessionCharacteristicsKeys =
                    Arrays.asList(CONTROL_ZOOM_RATIO_RANGE, SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
        }
        return mAvailableSessionCharacteristicsKeys;
    }