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

Commit 1722c403 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "Add SECURE camera capability."

parents 85114dc5 d88b4834

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16935,6 +16935,7 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA = 13; // 0xd

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7

    field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0

    field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1

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

+2 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING MOTION_TRACKING}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA LOGICAL_MULTI_CAMERA}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME MONOCHROME}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA SECURE_IMAGE_DATA}</li>

     * </ul></p>

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

     *
@@ -1918,6 +1919,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING

     * @see #REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA

     * @see #REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME

     * @see #REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA

     */

    @PublicKey

    public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES =

core/java/android/hardware/camera2/CameraMetadata.java

+8 −0
Original line number Diff line number Diff line
@@ -972,6 +972,14 @@ public abstract class CameraMetadata<TKey> { 
     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME = 12;



    /**

     * <p>The camera device is capable of writing image data into a region of memory

     * inaccessible to Android userspace or the Android kernel, and only accessible to

     * trusted execution environments (TEE).</p>

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA = 13;



    //

    // Enumeration values for CameraCharacteristics#SCALER_CROPPING_TYPE

    //