Merge "Camera: Remove flag 'concert_mode_api'" into main (72d929c5) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -125,14 +125,6 @@ flag {
		}
		}

		flag {
		namespace: "camera_platform"
		name: "concert_mode_api"
		description: "Covers the eyes free videography public facing API"
		bug: "297083874"
		}


		flag {
		namespace: "camera_platform"
		name: "cache_permission_services"

+0 −3

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ typedef enum acamera_metadata_section {
		ACAMERA_AUTOMOTIVE_LENS,
		ACAMERA_EXTENSION,
		ACAMERA_JPEGR,
		ACAMERA_EFV,
		ACAMERA_SECTION_COUNT,

		ACAMERA_VENDOR = 0x8000
		@@ -139,7 +138,6 @@ typedef enum acamera_metadata_section_start {
		ACAMERA_AUTOMOTIVE_LENS_START = ACAMERA_AUTOMOTIVE_LENS << 16,
		ACAMERA_EXTENSION_START = ACAMERA_EXTENSION << 16,
		ACAMERA_JPEGR_START = ACAMERA_JPEGR << 16,
		ACAMERA_EFV_START = ACAMERA_EFV << 16,
		ACAMERA_VENDOR_START = ACAMERA_VENDOR << 16
		} acamera_metadata_section_start_t;

		@@ -11573,7 +11571,6 @@ typedef enum acamera_metadata_enum_acamera_jpegr_available_jpeg_r_stream_configu




		__END_DECLS

		#endif /* _NDK_CAMERA_METADATA_TAGS_H */

+0 −9

Original line number	Diff line number	Diff line
		@@ -30,13 +30,4 @@
		std::vector<camera_metadata_tag> extension_metadata_keys{
		ANDROID_EXTENSION_STRENGTH,
		ANDROID_EXTENSION_CURRENT_TYPE,
		ANDROID_EFV_PADDING_ZOOM_FACTOR,
		ANDROID_EFV_AUTO_ZOOM,
		ANDROID_EFV_MAX_PADDING_ZOOM_FACTOR,
		ANDROID_EFV_STABILIZATION_MODE,
		ANDROID_EFV_TRANSLATE_VIEWPORT,
		ANDROID_EFV_ROTATE_VIEWPORT,
		ANDROID_EFV_PADDING_REGION,
		ANDROID_EFV_AUTO_ZOOM_PADDING_REGION,
		ANDROID_EFV_TARGET_COORDINATES,
		};

+0 −10

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{
		} },
		{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,
		@@ -121,15 +120,6 @@ std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{
		} },
		{35, {
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE,
		ANDROID_EFV_AUTO_ZOOM,
		ANDROID_EFV_AUTO_ZOOM_PADDING_REGION,
		ANDROID_EFV_MAX_PADDING_ZOOM_FACTOR,
		ANDROID_EFV_PADDING_REGION,
		ANDROID_EFV_PADDING_ZOOM_FACTOR,
		ANDROID_EFV_ROTATE_VIEWPORT,
		ANDROID_EFV_STABILIZATION_MODE,
		ANDROID_EFV_TARGET_COORDINATES,
		ANDROID_EFV_TRANSLATE_VIEWPORT,
		ANDROID_FLASH_STRENGTH_LEVEL,
		ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION,
		ANDROID_STATISTICS_LENS_INTRINSIC_SAMPLES,