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

Commit a3ebd837 authored by Shrikar Amirisetty's avatar Shrikar Amirisetty Committed by Android (Google) Code Review
Browse files

Merge changes from topics "cc_command", "cc_state", "cc_type", "elka_state", "rename_acc" 

* changes:
  Added CRUISE_CONTROL_COMMAND to HAL layer.
  Added CRUISE_CONTROL_STATE to HAL layer.
  Added CRUISE_CONTROL_TYPE to HAL layer.
  Added EMERGENCY_LANE_KEEP_ASSIST_STATE to HAL layer.
  Renamed ADAPTIVE_CRUISE_CONTROL_ENABLED to CRUISE_CONTROL_ENABLED in HAL
parents 593e94d7 5df0f957

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

+5 −1
Original line number Diff line number Diff line
@@ -258,7 +258,11 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyAccess::WRITE},

        {VehicleProperty::LANE_CENTERING_ASSIST_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {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::CRUISE_CONTROL_COMMAND, VehiclePropertyAccess::WRITE},

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

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

};

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

+5 −1
Original line number Diff line number Diff line
@@ -258,7 +258,11 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LANE_CENTERING_ASSIST_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {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::CRUISE_CONTROL_COMMAND, 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

+5 −1
Original line number Diff line number Diff line
@@ -250,7 +250,11 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_COMMAND, VehiclePropertyAccess.WRITE),

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

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

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

        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.CRUISE_CONTROL_COMMAND, VehiclePropertyAccess.WRITE),

        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

+5 −1
Original line number Diff line number Diff line
@@ -250,7 +250,11 @@ public final class ChangeModeForVehicleProperty { 
        Map.entry(VehicleProperty.LANE_CENTERING_ASSIST_COMMAND, 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.ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),

        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.CRUISE_CONTROL_COMMAND, 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

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 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::CruiseControlCommand;

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;

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

using ::aidl::android::hardware::automotive::vehicle::EvsServiceState;
@@ -218,6 +222,14 @@ JsonValueParser::JsonValueParser() { 
    mConstantParsersByType["FuelType"] = std::make_unique<ConstantParser<FuelType>>();

    mConstantParsersByType["WindshieldWipersState"] =

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

    mConstantParsersByType["EmergencyLaneKeepAssistState"] =

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

    mConstantParsersByType["CruiseControlType"] =

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

    mConstantParsersByType["CruiseControlState"] =

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

    mConstantParsersByType["CruiseControlCommand"] =

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

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

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

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