Merge "Add HAL changes for LANE_CENTERING_ASSIST_ENABLED" (19814856) · 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
		@@ -235,4 +235,5 @@ enum VehicleProperty {
		SUPPORTED_PROPERTY_IDS = 289476424,
		SHUTDOWN_REQUEST = 289410889,
		AUTOMATIC_EMERGENCY_BRAKING_ENABLED = 287313920,
		LANE_CENTERING_ASSIST_ENABLED = 287313930,
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -3382,6 +3382,27 @@ enum VehicleProperty {
		AUTOMATIC_EMERGENCY_BRAKING_ENABLED =
		0x1000 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/**
		* Enable or disable lane centering assist (LCA).
		*
		* Set true to enable LCA and false to disable LCA. When LCA is enabled, the ADAS system in the
		* vehicle should be turned on and waiting for an activation signal from the driver. Once the
		* feature is activated, the ADAS system should be steering the vehicle to keep it centered in
		* its current lane.
		*
		* This is different from Lane Keep Assist (LKA) which monitors if the driver unintentionally
		* drifts toward or over the lane marking. If an unintentional lane departure is detected, the
		* system applies steering control to return the vehicle into the current lane.
		*
		* 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
		*/
		LANE_CENTERING_ASSIST_ENABLED =
		0x100A + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

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

+1 −0

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

		} // namespace vehicle

+1 −0

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

		} // namespace vehicle

+2 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,8 @@ public final class AccessForVehicleProperty {
		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.AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess.READ_WRITE)
		Map.entry(VehicleProperty.AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess.READ_WRITE),
		Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE)
		);

		}