Merge "Specify FUEL_* properties don't apply to electric vehicles in HAL docs" into main (24789771) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@
		"value": 290521862
		},
		{
		"name": "FUEL_LEVEL",
		"name": "Fuel level in milliliters",
		"value": 291504903
		},
		{

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl

+17 −2

Original line number	Diff line number	Diff line
		@@ -142,6 +142,11 @@ enum VehicleProperty {
		/**
		* Fuel door location
		*
		* This property must communicate the location of the fuel door on the vehicle. This property
		* does not apply to electric vehicles. That is, if INFO_FUEL_TYPE only contains
		* FuelType::FUEL_TYPE_ELECTRIC, this property must not be implemented. For EVs, implement
		* INFO_EV_PORT_LOCATION or INFO_MULTI_EV_PORT_LOCATIONS.
		*
		* @change_mode VehiclePropertyChangeMode.STATIC
		* @data_enum PortLocationType
		* @access VehiclePropertyAccess.READ
		@@ -350,9 +355,14 @@ enum VehicleProperty {
		WHEEL_TICK = 0x0306 + 0x10000000 + 0x01000000
		+ 0x00510000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT64_VEC
		/**
		* Fuel remaining in the vehicle, in milliliters
		* Fuel level in milliliters
		*
		* This property must communicate the current amount of fuel remaining in the vehicle in
		* milliliters. This property does not apply to electric vehicles. That is, if INFO_FUEL_TYPE
		* only contains FuelType::FUEL_TYPE_ELECTRIC, this property must not be implemented. For EVs,
		* implement EV_BATTERY_LEVEL.
		*
		* Value may not exceed INFO_FUEL_CAPACITY
		* Value may not exceed INFO_FUEL_CAPACITY.
		*
		* @change_mode VehiclePropertyChangeMode.CONTINUOUS
		* @access VehiclePropertyAccess.READ
		@@ -364,6 +374,11 @@ enum VehicleProperty {
		/**
		* Fuel door open
		*
		* This property must communicate whether the fuel door on the vehicle is open or not. This
		* property does not apply to electric vehicles. That is, if INFO_FUEL_TYPE only contains
		* FuelType::FUEL_TYPE_ELECTRIC, this property must not be implemented. For EVs, implement
		* EV_CHARGE_PORT_OPEN.
		*
		* This property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to
		* implement it as VehiclePropertyAccess.READ only.
		*