From 6d3fa0a331aac552fe09f8414f8792e11db80ad9 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Thu, 27 May 2021 14:05:57 -0700 Subject: [PATCH] Camera: Add framework-only enum value to test pattern mode Adding TEST_PATTERN_MODE_BLACK to support the new sensor privacy feature on more limited-capability camera implementations. Also updating older docs due to an API being moved to public. Test: Camera CTS continues to pass Bug: 189507251 Change-Id: I043d011ad43070d6c402cdffbff3d2e9b70ffd7b --- camera/metadata/3.5/types.hal | 4 ++-- camera/metadata/3.6/types.hal | 8 ++++++++ current.txt | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/camera/metadata/3.5/types.hal b/camera/metadata/3.5/types.hal index 99d61152ac..d32bc91968 100644 --- a/camera/metadata/3.5/types.hal +++ b/camera/metadata/3.5/types.hal @@ -73,7 +73,7 @@ enum CameraMetadataTag : @3.4::CameraMetadataTag { ANDROID_CONTROL_END_3_5, - /** android.scaler.availableRotateAndCropModes [static, byte[], hidden] + /** android.scaler.availableRotateAndCropModes [static, byte[], public] * *

List of rotate-and-crop modes for ANDROID_SCALER_ROTATE_AND_CROP that are supported by this camera device.

* @@ -81,7 +81,7 @@ enum CameraMetadataTag : @3.4::CameraMetadataTag { */ ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES = android.hardware.camera.metadata@3.4::CameraMetadataTag:ANDROID_SCALER_END_3_4, - /** android.scaler.rotateAndCrop [dynamic, enum, hidden] + /** android.scaler.rotateAndCrop [dynamic, enum, public] * *

Whether a rotation-and-crop operation is applied to processed * outputs from the camera.

diff --git a/camera/metadata/3.6/types.hal b/camera/metadata/3.6/types.hal index 97cac7c3e8..185687c4df 100644 --- a/camera/metadata/3.6/types.hal +++ b/camera/metadata/3.6/types.hal @@ -348,6 +348,14 @@ enum CameraMetadataEnumAndroidScalerMultiResolutionStreamSupported : uint32_t { ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED_TRUE, }; +/** android.sensor.testPatternMode enumeration values added since v3.2 + * @see ANDROID_SENSOR_TEST_PATTERN_MODE + */ +enum CameraMetadataEnumAndroidSensorTestPatternMode : + @3.2::CameraMetadataEnumAndroidSensorTestPatternMode { + ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK, +}; + /** android.sensor.pixelMode enumeration values * @see ANDROID_SENSOR_PIXEL_MODE */ diff --git a/current.txt b/current.txt index 3102972081..ca4fb61e6d 100644 --- a/current.txt +++ b/current.txt @@ -767,6 +767,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types # ABI preserving changes to HALs during Android S +159a0069336035852e9eca6354b86b7990680d1b239f23ef2f631b01807c4cb9 android.hardware.camera.metadata@3.5::types e042522daa4b5f7fd4a0a19bcdadb93c79a1b04c09ef2c9813a3a8941032f3f5 android.hardware.contexthub@1.0::IContexthub c2f64133b83ede65c9939ef97ab5bd867b73faf3dba0e7e69f77c3c43d9e487e android.hardware.contexthub@1.0::IContexthubCallback bda492ec4021d13869de72bd6f8c15c5837b78d6136b8d538efec5320573a5ec android.hardware.gnss@1.0::IGnssMeasurementCallback @@ -834,7 +835,7 @@ c17d9e27abd37ae5a8ff8da08fc5c9b13a264670feef6bbbc9d3ab1915216130 android.hardwar 3be6faa3d11ad9c7ec01a1a0a009cf11cb65d701d109dab37613ce9cfb3cdd60 android.hardware.camera.device@3.7::ICameraDeviceSession 3740ec773b2eb8fa6bd8c6e879eedb56c4e4306b88f1c20fa51103d791d871b1 android.hardware.camera.device@3.7::ICameraInjectionSession 21f023685571daf46148097d98b89cea353f07e3ed83b2ed5685b23bd136c3ee android.hardware.camera.device@3.7::types -f655c93132d223369ff6ddc621cb721f82dde6cc85ab9df2cbde6cb24cf2c885 android.hardware.camera.metadata@3.6::types +e932e7ef95210142e1fd3a4504e1d19bdb1acc988450f1ced543f3401f67855a android.hardware.camera.metadata@3.6::types 98ff825a7d37e5ab983502d13cec1f2e5a9cac9b674b6ff1a52bcf540f4e315e android.hardware.camera.provider@2.7::ICameraProvider 51fd14005859b16be55872660c34f5d423c77a2abcc5d4bdd5a537c40f32516b android.hardware.camera.provider@2.7::types 3500d3c4e2d49eeed2f3239330a166beb2db2d5071b84d9c738b048c2d54a3d9 android.hardware.contexthub@1.2::IContexthub