Merge "Add HAL changes for AUTOMATIC_EMERGENCY_BRAKING_ENABLED" (c79b1bd0) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -231,4 +231,5 @@ enum VehicleProperty {
		GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT = 289410887,
		SUPPORTED_PROPERTY_IDS = 289476424,
		SHUTDOWN_REQUEST = 289410889,
		AUTOMATIC_EMERGENCY_BRAKING_ENABLED = 287313920,
		}

+24 −0

Original line number	Diff line number	Diff line
		@@ -3296,4 +3296,28 @@ enum VehicleProperty {
		*/
		SHUTDOWN_REQUEST =
		0x0F49 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

		/***************************************************************************
		* Start of ADAS Properties
		* Allocate IDs in range of 0x1000 (inclusive) to 0x1100 (exclusive) for ADAS properties
		**************************************************************************/

		/**
		* Enable or disable automatic emergency braking (AEB).
		*
		* Set true to enable AEB and false to disable AEB. When AEB is enabled, the ADAS system in the
		* vehicle should be turned on and monitoring to avoid potential collisions.
		*
		* This property is defined as read_write, but OEMs have the option to implement it as read
		* only.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		*/
		AUTOMATIC_EMERGENCY_BRAKING_ENABLED =
		0x1000 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/***************************************************************************
		* End of ADAS Properties
		**************************************************************************/
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope
		{VehicleProperty::GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT, VehiclePropertyAccess::READ},
		{VehicleProperty::SUPPORTED_PROPERTY_IDS, VehiclePropertyAccess::READ},
		{VehicleProperty::SHUTDOWN_REQUEST, VehiclePropertyAccess::WRITE},
		{VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess::READ_WRITE},
		};

		} // namespace vehicle

+1 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi
		{VehicleProperty::GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT, VehiclePropertyChangeMode::STATIC},
		{VehicleProperty::SUPPORTED_PROPERTY_IDS, VehiclePropertyChangeMode::STATIC},
		{VehicleProperty::SHUTDOWN_REQUEST, VehiclePropertyChangeMode::ON_CHANGE},
		{VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},
		};

		} // namespace vehicle

+2 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,8 @@ public final class AccessForVehicleProperty {
		Map.entry(VehicleProperty.VEHICLE_CURB_WEIGHT, VehiclePropertyAccess.READ),
		Map.entry(VehicleProperty.GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT, VehiclePropertyAccess.READ),
		Map.entry(VehicleProperty.SUPPORTED_PROPERTY_IDS, VehiclePropertyAccess.READ),
		Map.entry(VehicleProperty.SHUTDOWN_REQUEST, VehiclePropertyAccess.WRITE)
		Map.entry(VehicleProperty.SHUTDOWN_REQUEST, VehiclePropertyAccess.WRITE),
		Map.entry(VehicleProperty.AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess.READ_WRITE)
		);

		}