Merge "Camera: Fix hal version for keys added in V" into main (e3ee3c85) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/aidl/VndkVersionMetadataTags.h

+14 −10

Original line number	Diff line number	Diff line
		@@ -77,12 +77,6 @@ std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{
		{34, {
		ANDROID_CONTROL_AUTOFRAMING_AVAILABLE,
		ANDROID_CONTROL_AVAILABLE_SETTINGS_OVERRIDES,
		ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE,
		ANDROID_EFV_PADDING_ZOOM_FACTOR_RANGE,
		ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,
		ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,
		ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,
		ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL,
		ANDROID_JPEGR_AVAILABLE_JPEG_R_MIN_FRAME_DURATIONS,
		ANDROID_JPEGR_AVAILABLE_JPEG_R_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_JPEGR_AVAILABLE_JPEG_R_STALL_DURATIONS,
		@@ -91,6 +85,14 @@ std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{
		ANDROID_JPEGR_AVAILABLE_JPEG_R_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP,
		} },
		{35, {
		ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE,
		ANDROID_EFV_PADDING_ZOOM_FACTOR_RANGE,
		ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,
		ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,
		ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,
		ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL,
		} },
		};

		/**
		@@ -110,9 +112,14 @@ std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{
		{34, {
		ANDROID_CONTROL_AUTOFRAMING,
		ANDROID_CONTROL_AUTOFRAMING_STATE,
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE,
		ANDROID_CONTROL_SETTINGS_OVERRIDE,
		ANDROID_CONTROL_SETTINGS_OVERRIDING_FRAME_NUMBER,
		ANDROID_EXTENSION_CURRENT_TYPE,
		ANDROID_EXTENSION_STRENGTH,
		ANDROID_SCALER_RAW_CROP_REGION,
		} },
		{35, {
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE,
		ANDROID_EFV_AUTO_ZOOM,
		ANDROID_EFV_AUTO_ZOOM_PADDING_REGION,
		ANDROID_EFV_MAX_PADDING_ZOOM_FACTOR,
		@@ -122,11 +129,8 @@ std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{
		ANDROID_EFV_STABILIZATION_MODE,
		ANDROID_EFV_TARGET_COORDINATES,
		ANDROID_EFV_TRANSLATE_VIEWPORT,
		ANDROID_EXTENSION_CURRENT_TYPE,
		ANDROID_EXTENSION_STRENGTH,
		ANDROID_FLASH_STRENGTH_LEVEL,
		ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION,
		ANDROID_SCALER_RAW_CROP_REGION,
		ANDROID_STATISTICS_LENS_INTRINSIC_SAMPLES,
		ANDROID_STATISTICS_LENS_INTRINSIC_TIMESTAMPS,
		} },