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

Commit 2753b9ed authored by shrikar's avatar shrikar
Browse files

Added CRUISE_CONTROL_STATE to HAL layer. 

Bug: 266866448
Test: atest VtsHalAutomotiveVehicle_TargetTest
Change-Id: I35a10ba6a3799a86265fc26d8d0643b7d7bdd446
parent d440ed41

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

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::CRUISE_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::CRUISE_CONTROL_TYPE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::CRUISE_CONTROL_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyAccess::READ_WRITE},

};

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

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CRUISE_CONTROL_TYPE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CRUISE_CONTROL_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

};

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

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.EMERGENCY_LANE_KEEP_ASSIST_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.CRUISE_CONTROL_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.CRUISE_CONTROL_TYPE, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.CRUISE_CONTROL_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyAccess.READ_WRITE)

    );

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

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ public final class ChangeModeForVehicleProperty { 
        Map.entry(VehicleProperty.EMERGENCY_LANE_KEEP_ASSIST_STATE, VehiclePropertyChangeMode.ON_CHANGE),

        Map.entry(VehicleProperty.CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),

        Map.entry(VehicleProperty.CRUISE_CONTROL_TYPE, VehiclePropertyChangeMode.ON_CHANGE),

        Map.entry(VehicleProperty.CRUISE_CONTROL_STATE, VehiclePropertyChangeMode.ON_CHANGE),

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),

        Map.entry(VehicleProperty.DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyChangeMode.ON_CHANGE)

    );

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ using ::aidl::android::hardware::automotive::vehicle::AccessForVehicleProperty; 
using ::aidl::android::hardware::automotive::vehicle::AutomaticEmergencyBrakingState;

using ::aidl::android::hardware::automotive::vehicle::BlindSpotWarningState;

using ::aidl::android::hardware::automotive::vehicle::ChangeModeForVehicleProperty;

using ::aidl::android::hardware::automotive::vehicle::CruiseControlState;

using ::aidl::android::hardware::automotive::vehicle::CruiseControlType;

using ::aidl::android::hardware::automotive::vehicle::EmergencyLaneKeepAssistState;

using ::aidl::android::hardware::automotive::vehicle::ErrorState;
@@ -224,6 +225,8 @@ JsonValueParser::JsonValueParser() { 
            std::make_unique<ConstantParser<EmergencyLaneKeepAssistState>>();

    mConstantParsersByType["CruiseControlType"] =

            std::make_unique<ConstantParser<CruiseControlType>>();

    mConstantParsersByType["CruiseControlState"] =

            std::make_unique<ConstantParser<CruiseControlState>>();

    mConstantParsersByType["ErrorState"] = std::make_unique<ConstantParser<ErrorState>>();

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

            std::make_unique<ConstantParser<AutomaticEmergencyBrakingState>>();