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

Commit 9ac76172 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Automerger Merge Worker
Browse files

Merge "Camera: add default secure image size key" into sc-dev am: 73ef4bcc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13555620

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99a2971506e29856646c5564f2e472224c1f8dbd
parents a711d947 73ef4bcc

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17707,6 +17707,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SCALER_AVAILABLE_ROTATE_AND_CROP_MODES;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SCALER_CROPPING_TYPE;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size> SCALER_DEFAULT_SECURE_IMAGE_SIZE;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_STREAM_COMBINATIONS;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.StreamConfigurationMap> SCALER_STREAM_CONFIGURATION_MAP;

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

+23 −0
Original line number Diff line number Diff line
@@ -2907,6 +2907,29 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<int[]> SCALER_AVAILABLE_ROTATE_AND_CROP_MODES =

            new Key<int[]>("android.scaler.availableRotateAndCropModes", int[].class);



    /**

     * <p>Default YUV/PRIVATE size to use for requesting secure image buffers.</p>

     * <p>This entry lists the default size supported in the secure camera mode. This entry is

     * optional on devices support the SECURE_IMAGE_DATA capability. This entry will be null

     * if the camera device does not list SECURE_IMAGE_DATA capability.</p>

     * <p>When the key is present, only a PRIVATE/YUV output of the specified size is guaranteed

     * to be supported by the camera HAL in the secure camera mode. Any other format or

     * resolutions might not be supported. Use

     * {@link CameraDevice#isSessionConfigurationSupported }

     * API to query if a secure session configuration is supported if the device supports this

     * API.</p>

     * <p>If this key returns null on a device with SECURE_IMAGE_DATA capability, the application

     * can assume all output sizes listed in the

     * {@link android.hardware.camera2.params.StreamConfigurationMap }

     * are supported.</p>

     * <p><b>Units</b>: Pixels</p>

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

     */

    @PublicKey

    @NonNull

    public static final Key<android.util.Size> SCALER_DEFAULT_SECURE_IMAGE_SIZE =

            new Key<android.util.Size>("android.scaler.defaultSecureImageSize", android.util.Size.class);



    /**

     * <p>The area of the image sensor which corresponds to active pixels after any geometric

     * distortion correction has been applied.</p>