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

Commit b0fafd77 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add feature combination query version for Baklava" into main

parents 611c9fbf 2bedb57e

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

+27 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * on a particular SessionConfiguration.</p>

     *

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

     * configuration. If {@link #INFO_SESSION_CONFIGURATION_QUERY_VERSION} is

     * configuration. If {@link #INFO_SESSION_CONFIGURATION_QUERY_VERSION} is at least

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

     * CONTROL_ZOOM_RATIO_RANGE and SCALER_AVAILABLE_MAX_DIGITAL_ZOOM

     *
@@ -5259,6 +5259,32 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>All of the above configurations can be set up with a SessionConfiguration. The list of

     * OutputConfiguration contains the stream configurations and DYNAMIC_RANGE_PROFILE, and

     * the AE_TARGET_FPS_RANGE and VIDEO_STABILIZATION_MODE are set as session parameters.</p>

     * <p>When set to BAKLAVA, the additional stream combinations below are verified

     * by the compliance tests:</p>

     * <table>

     * <thead>

     * <tr>

     * <th style="text-align: center;">Target 1</th>

     * <th style="text-align: center;">Size</th>

     * <th style="text-align: center;">Target 2</th>

     * <th style="text-align: center;">Size</th>

     * </tr>

     * </thead>

     * <tbody>

     * <tr>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1080P</td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1440P</td>

     * </tr>

     * </tbody>

     * </table>

     * <p>This key is available on all devices.</p>

     */

    @PublicKey