Snap for 4745538 from 7fa25dee8f24c7e8b22f7e499efe1acabe979f31 to pi-release (70563fb8) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+12 −11

Original line number	Diff line number	Diff line
		@@ -242,17 +242,18 @@ const ConfigDeclaration kVehicleProperties[]{
		},
		.initialValue = {.int32Values = {0, 0, 0}}},

		{.config =
		{
		.prop = toInt(VehicleProperty::HVAC_POWER_ON),
		{.config = {.prop = toInt(VehicleProperty::HVAC_POWER_ON),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.areaConfigs = {VehicleAreaConfig{
		.areaId = (VehicleAreaSeat::ROW_1_LEFT \| VehicleAreaSeat::ROW_1_RIGHT)}},
		// TODO(bryaneyler): Ideally, this is generated dynamically from
		// kHvacPowerProperties.
		.configString = "0x12400500,0x12400501" // HVAC_FAN_SPEED,HVAC_FAN_DIRECTION
		},
		.configArray =
		{
		0x12400500, // HVAC_FAN_SPEED
		0x12400501 // HVAC_FAN_DIRECTION
		}},
		.initialValue = {.int32Values = {1}}},

		{

automotive/vehicle/2.0/types.hal

+14 −12

Original line number	Diff line number	Diff line
		@@ -2003,30 +2003,32 @@ enum VehicleLightSwitch : int32_t {

		/**
		* Used by INFO_EV_CONNECTOR_TYPE to enumerate the type of connectors
		* available to charge the vehicle. Consistent with projection protocol.
		* available to charge the vehicle.
		*/
		enum EvConnectorType : int32_t {
		/**
		* Default type if the vehicle does not know or report the EV connector
		* type.
		*/
		EV_CONNECTOR_TYPE_UNKNOWN = 0,
		EV_CONNECTOR_TYPE_J1772 = 1,
		EV_CONNECTOR_TYPE_MENNEKES = 2,
		EV_CONNECTOR_TYPE_CHADEMO = 3,
		EV_CONNECTOR_TYPE_COMBO_1 = 4,
		EV_CONNECTOR_TYPE_COMBO_2 = 5,
		EV_CONNECTOR_TYPE_TESLA_ROADSTER = 6,
		EV_CONNECTOR_TYPE_TESLA_HPWC = 7,
		EV_CONNECTOR_TYPE_TESLA_SUPERCHARGER = 8,
		EV_CONNECTOR_TYPE_GBT = 9,
		UNKNOWN = 0,
		IEC_TYPE_1_AC = 1, // aka Yazaki
		IEC_TYPE_2_AC = 2, // aka Mennekes
		IEC_TYPE_3_AC = 3, // aka Scame
		IEC_TYPE_4_DC = 4, // aka CHAdeMO
		IEC_TYPE_1_CCS_DC = 5, // aka Combo 1
		IEC_TYPE_2_CCS_DC = 6, // aka Combo 2
		TESLA_ROADSTER = 7,
		TESLA_HPWC = 8,
		TESLA_SUPERCHARGER = 9,
		GBT_AC = 10,
		GBT_DC = 11,

		/**
		* Connector type to use when no other types apply. Before using this
		* value, work with Google to see if the EvConnectorType enum can be
		* extended with an appropriate value.
		*/
		EV_CONNECTOR_TYPE_OTHER = 101,
		OTHER = 101,
		};

		/**

current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar
		3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types
		b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle
		7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback
		2e1815967a3e3278a7f304ed7efc04fbc56d0bb65b3126248c3a0d515b93f63d android.hardware.automotive.vehicle@2.0::types
		962b18e414231b5f3930d63daba116347241b3606242b0606b3699ba25b14315 android.hardware.automotive.vehicle@2.0::types
		32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost
		ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload
		27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types
		@@ -327,7 +327,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar
		83e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback
		0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types
		d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer
		c3cd2a3e245ffefae859c9a3d31382a9421be95cfa6bc1231571eb3533049b54 android.hardware.graphics.composer@2.2::IComposerClient
		18eff12102db47b03a5fa906f8d4fd9018f0fb9236c663d457b8eac8d57c2937 android.hardware.graphics.composer@2.2::IComposerClient
		dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper
		675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth
		434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback

graphics/composer/2.2/IComposerClient.hal

+3 −4

Original line number	Diff line number	Diff line
		@@ -383,9 +383,8 @@ interface IComposerClient extends @2.1::IComposerClient {
		* By default, layer dataspaces are mapped to the current color mode
		* colorimetrically with a few exceptions.
		*
		* When the layer dataspace is a legacy sRGB dataspace
		* (Dataspace::SRGB_LINEAR, Dataspace::SRGB, or Dataspace::UNKNOWN when
		* treated as such) and the display render intent is
		* When the layer dataspace is a legacy dataspace (see
		* common@1.1::Dataspace) and the display render intent is
		* RenderIntent::ENHANCE, the pixel values can go through an
		* implementation-defined saturation transform before being mapped to the
		* current color mode colorimetrically.
		@@ -402,7 +401,7 @@ interface IComposerClient extends @2.1::IComposerClient {
		* this:
		*
		* (in GLSL)
		* linearSrgb = clamp(saturationMatrix * linearSrgb, 0.0, 1.0);
		* linearSrgb = saturationMatrix * linearSrgb;
		*
		* @param dataspace must be Dataspace::SRGB_LINEAR.
		* @return error is NONE upon success. Otherwise,