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

Commit 0ffd39c1 authored Jan 11, 2023 by Aaqib Ismail

Add HAL changes for LANE_CENTERING_ASSIST_COMMAND

Bug: 264946354
Test: atest VtsHalAutomotiveVehicle_TargetTest
Test: atest CtsCarTestCases:CarPropertyManagerTest
Test: atest CtsCarTestCases:VehiclePropertyIdsTest
Test: atest CtsCarTestCases:LaneCenteringAssistCommandTest
Test: atest AndroidCarApiTest:LaneCenteringAssistCommandTest
Change-Id: I126ed24748f9ef7cd9bc0541e2bdbf75eac43edf

parent f5b63fcf

automotive/vehicle/aidl/generated_lib/cpp/AccessForVehicleProperty.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -250,6 +250,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope
	{VehicleProperty::LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},		{VehicleProperty::LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},
	{VehicleProperty::LANE_KEEP_ASSIST_STATE, VehiclePropertyAccess::READ},		{VehicleProperty::LANE_KEEP_ASSIST_STATE, VehiclePropertyAccess::READ},
	{VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},		{VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},
			{VehicleProperty::LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyAccess::WRITE},
	{VehicleProperty::LANE_CENTERING_ASSIST_STATE, VehiclePropertyAccess::READ},		{VehicleProperty::LANE_CENTERING_ASSIST_STATE, VehiclePropertyAccess::READ},
	{VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},		{VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},
	{VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},		{VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},

automotive/vehicle/aidl/generated_lib/cpp/ChangeModeForVehicleProperty.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -250,6 +250,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi
	{VehicleProperty::LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},		{VehicleProperty::LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},
	{VehicleProperty::LANE_KEEP_ASSIST_STATE, VehiclePropertyChangeMode::ON_CHANGE},		{VehicleProperty::LANE_KEEP_ASSIST_STATE, VehiclePropertyChangeMode::ON_CHANGE},
	{VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},		{VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},
			{VehicleProperty::LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyChangeMode::ON_CHANGE},
	{VehicleProperty::LANE_CENTERING_ASSIST_STATE, VehiclePropertyChangeMode::ON_CHANGE},		{VehicleProperty::LANE_CENTERING_ASSIST_STATE, VehiclePropertyChangeMode::ON_CHANGE},
	{VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},		{VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},
	{VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},		{VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

automotive/vehicle/aidl/generated_lib/java/AccessForVehicleProperty.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -242,6 +242,7 @@ public final class AccessForVehicleProperty {
	Map.entry(VehicleProperty.LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE),		Map.entry(VehicleProperty.LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE),
	Map.entry(VehicleProperty.LANE_KEEP_ASSIST_STATE, VehiclePropertyAccess.READ),		Map.entry(VehicleProperty.LANE_KEEP_ASSIST_STATE, VehiclePropertyAccess.READ),
	Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE),		Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE),
			Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyAccess.WRITE),
	Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_STATE, VehiclePropertyAccess.READ),		Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_STATE, VehiclePropertyAccess.READ),
	Map.entry(VehicleProperty.EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE),		Map.entry(VehicleProperty.EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess.READ_WRITE),
	Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess.READ_WRITE),		Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess.READ_WRITE),

automotive/vehicle/aidl/generated_lib/java/ChangeModeForVehicleProperty.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -242,6 +242,7 @@ public final class ChangeModeForVehicleProperty {
	Map.entry(VehicleProperty.LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),		Map.entry(VehicleProperty.LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),
	Map.entry(VehicleProperty.LANE_KEEP_ASSIST_STATE, VehiclePropertyChangeMode.ON_CHANGE),		Map.entry(VehicleProperty.LANE_KEEP_ASSIST_STATE, VehiclePropertyChangeMode.ON_CHANGE),
	Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),		Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),
			Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyChangeMode.ON_CHANGE),
	Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_STATE, VehiclePropertyChangeMode.ON_CHANGE),		Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_STATE, VehiclePropertyChangeMode.ON_CHANGE),
	Map.entry(VehicleProperty.EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),		Map.entry(VehicleProperty.EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),
	Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),		Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),

automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,7 @@ using ::aidl::android::hardware::automotive::vehicle::EvsServiceType;
	using ::aidl::android::hardware::automotive::vehicle::ForwardCollisionWarningState;		using ::aidl::android::hardware::automotive::vehicle::ForwardCollisionWarningState;
	using ::aidl::android::hardware::automotive::vehicle::FuelType;		using ::aidl::android::hardware::automotive::vehicle::FuelType;
	using ::aidl::android::hardware::automotive::vehicle::GsrComplianceRequirementType;		using ::aidl::android::hardware::automotive::vehicle::GsrComplianceRequirementType;
			using ::aidl::android::hardware::automotive::vehicle::LaneCenteringAssistCommand;
	using ::aidl::android::hardware::automotive::vehicle::LaneCenteringAssistState;		using ::aidl::android::hardware::automotive::vehicle::LaneCenteringAssistState;
	using ::aidl::android::hardware::automotive::vehicle::LaneKeepAssistState;		using ::aidl::android::hardware::automotive::vehicle::LaneKeepAssistState;
	using ::aidl::android::hardware::automotive::vehicle::RawPropValues;		using ::aidl::android::hardware::automotive::vehicle::RawPropValues;
	@@ -222,6 +223,8 @@ JsonValueParser::JsonValueParser() {
	std::make_unique<ConstantParser<BlindSpotWarningState>>();		std::make_unique<ConstantParser<BlindSpotWarningState>>();
	mConstantParsersByType["LaneKeepAssistState"] =		mConstantParsersByType["LaneKeepAssistState"] =
	std::make_unique<ConstantParser<LaneKeepAssistState>>();		std::make_unique<ConstantParser<LaneKeepAssistState>>();
			mConstantParsersByType["LaneCenteringAssistCommand"] =
			std::make_unique<ConstantParser<LaneCenteringAssistCommand>>();
	mConstantParsersByType["LaneCenteringAssistState"] =		mConstantParsersByType["LaneCenteringAssistState"] =
	std::make_unique<ConstantParser<LaneCenteringAssistState>>();		std::make_unique<ConstantParser<LaneCenteringAssistState>>();
	mConstantParsersByType["Constants"] = std::make_unique<LocalVariableParser>();		mConstantParsersByType["Constants"] = std::make_unique<LocalVariableParser>();