diff options
| author | 2019-01-24 18:11:09 -0800 | |
|---|---|---|
| committer | 2019-01-30 15:34:04 -0800 | |
| commit | d88b48346a904da58cacf138fd96f36f3c53abff (patch) | |
| tree | 35f312e7909b8619b0628bc33a370a9980f5f565 | |
| parent | 0544b1ac87ab6ff4ef95344f39f13f67533ab8e5 (diff) | |
Add SECURE camera capability.
Bug: 123046494
Test: builds
Change-Id: I5ee5203508436fd59590a78d633155c5a62d6c72
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 8 |
3 files changed, 11 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 10d1697e36ee..920d09066106 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16906,6 +16906,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 diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 4bc270200c78..1881a0cd32e8 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -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 = diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 6302aa536214..a3e561c960ef 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -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 // |