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

Commit cb4e3c23 authored Jun 15, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Jun 15, 2021

Merge "Camera: Add framework-only enum value to test pattern mode" into sc-dev...

Merge "Camera: Add framework-only enum value to test pattern mode" into sc-dev am: 0dd1d390 am: 4fbee2a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14752518

Change-Id: I47d44703900fb7a6bccf2b5fbddbe0f298469dfa

parents 26caefda 4fbee2a6

camera/metadata/3.5/types.hal

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ enum CameraMetadataTag : @3.4::CameraMetadataTag {

	ANDROID_CONTROL_END_3_5,		ANDROID_CONTROL_END_3_5,

	/** android.scaler.availableRotateAndCropModes [static, byte[], hidden]		/** android.scaler.availableRotateAndCropModes [static, byte[], public]
	*		*
	* <p>List of rotate-and-crop modes for ANDROID_SCALER_ROTATE_AND_CROP that are supported by this camera device.</p>		* <p>List of rotate-and-crop modes for ANDROID_SCALER_ROTATE_AND_CROP that are supported by this camera device.</p>
	*		*
	@@ -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_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]
	*		*
	* <p>Whether a rotation-and-crop operation is applied to processed		* <p>Whether a rotation-and-crop operation is applied to processed
	* outputs from the camera.</p>		* outputs from the camera.</p>

camera/metadata/3.6/types.hal

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -348,6 +348,14 @@ enum CameraMetadataEnumAndroidScalerMultiResolutionStreamSupported : uint32_t {
	ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED_TRUE,		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		/** android.sensor.pixelMode enumeration values
	* @see ANDROID_SENSOR_PIXEL_MODE		* @see ANDROID_SENSOR_PIXEL_MODE
	*/		*/

current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -767,6 +767,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar
	98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types		98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types

	# ABI preserving changes to HALs during Android S		# ABI preserving changes to HALs during Android S
			159a0069336035852e9eca6354b86b7990680d1b239f23ef2f631b01807c4cb9 android.hardware.camera.metadata@3.5::types
	e042522daa4b5f7fd4a0a19bcdadb93c79a1b04c09ef2c9813a3a8941032f3f5 android.hardware.contexthub@1.0::IContexthub		e042522daa4b5f7fd4a0a19bcdadb93c79a1b04c09ef2c9813a3a8941032f3f5 android.hardware.contexthub@1.0::IContexthub
	c2f64133b83ede65c9939ef97ab5bd867b73faf3dba0e7e69f77c3c43d9e487e android.hardware.contexthub@1.0::IContexthubCallback		c2f64133b83ede65c9939ef97ab5bd867b73faf3dba0e7e69f77c3c43d9e487e android.hardware.contexthub@1.0::IContexthubCallback
	bda492ec4021d13869de72bd6f8c15c5837b78d6136b8d538efec5320573a5ec android.hardware.gnss@1.0::IGnssMeasurementCallback		bda492ec4021d13869de72bd6f8c15c5837b78d6136b8d538efec5320573a5ec android.hardware.gnss@1.0::IGnssMeasurementCallback
	@@ -837,7 +838,7 @@ c17d9e27abd37ae5a8ff8da08fc5c9b13a264670feef6bbbc9d3ab1915216130 android.hardwar
	3be6faa3d11ad9c7ec01a1a0a009cf11cb65d701d109dab37613ce9cfb3cdd60 android.hardware.camera.device@3.7::ICameraDeviceSession		3be6faa3d11ad9c7ec01a1a0a009cf11cb65d701d109dab37613ce9cfb3cdd60 android.hardware.camera.device@3.7::ICameraDeviceSession
	3740ec773b2eb8fa6bd8c6e879eedb56c4e4306b88f1c20fa51103d791d871b1 android.hardware.camera.device@3.7::ICameraInjectionSession		3740ec773b2eb8fa6bd8c6e879eedb56c4e4306b88f1c20fa51103d791d871b1 android.hardware.camera.device@3.7::ICameraInjectionSession
	21f023685571daf46148097d98b89cea353f07e3ed83b2ed5685b23bd136c3ee android.hardware.camera.device@3.7::types		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		98ff825a7d37e5ab983502d13cec1f2e5a9cac9b674b6ff1a52bcf540f4e315e android.hardware.camera.provider@2.7::ICameraProvider
	51fd14005859b16be55872660c34f5d423c77a2abcc5d4bdd5a537c40f32516b android.hardware.camera.provider@2.7::types		51fd14005859b16be55872660c34f5d423c77a2abcc5d4bdd5a537c40f32516b android.hardware.camera.provider@2.7::types
	3500d3c4e2d49eeed2f3239330a166beb2db2d5071b84d9c738b048c2d54a3d9 android.hardware.contexthub@1.2::IContexthub		3500d3c4e2d49eeed2f3239330a166beb2db2d5071b84d9c738b048c2d54a3d9 android.hardware.contexthub@1.2::IContexthub