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

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

Merge changes from topics "dam_state", "driver_attention_monitoring_warning",... 

Merge changes from topics "dam_state", "driver_attention_monitoring_warning", "hands_on_detection_driver_state", "hands_on_detection_warning"

* changes:
  Added DRIVER_ATTENTION_MONITORING_STATE to HAL layer.
  Added DRIVER_ATTENTION_MONITORING_WARNING to HAL layer.
  Added HANDS_ON_DETECTION_WARNING to HAL layer.
  Added HANDS_ON_DETECTION_DRIVER_STATE to HAL layer
parents b9f8d256 22164c6b

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

+4 −0
Original line number Diff line number Diff line
@@ -264,7 +264,11 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::CRUISE_CONTROL_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::CRUISE_CONTROL_COMMAND, VehiclePropertyAccess::WRITE},

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

        {VehicleProperty::HANDS_ON_DETECTION_DRIVER_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::HANDS_ON_DETECTION_WARNING, VehiclePropertyAccess::READ},

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

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_WARNING, VehiclePropertyAccess::READ},

};



}  // namespace vehicle

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

+4 −0
Original line number Diff line number Diff line
@@ -264,7 +264,11 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::CRUISE_CONTROL_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CRUISE_CONTROL_COMMAND, VehiclePropertyChangeMode::ON_CHANGE},

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

        {VehicleProperty::HANDS_ON_DETECTION_DRIVER_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::HANDS_ON_DETECTION_WARNING, VehiclePropertyChangeMode::ON_CHANGE},

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

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_WARNING, VehiclePropertyChangeMode::ON_CHANGE},

};



}  // namespace vehicle

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

+5 −1
Original line number Diff line number Diff line
@@ -256,7 +256,11 @@ public final class AccessForVehicleProperty { 
        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)

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

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

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

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

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

    );



}

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

+5 −1
Original line number Diff line number Diff line
@@ -256,7 +256,11 @@ public final class ChangeModeForVehicleProperty { 
        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)

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

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

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

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

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

    );



}

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

+12 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ using ::aidl::android::hardware::automotive::vehicle::ChangeModeForVehicleProper 
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::DriverAttentionMonitoringState;

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

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

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

using ::aidl::android::hardware::automotive::vehicle::EvConnectorType;
@@ -49,6 +51,8 @@ using ::aidl::android::hardware::automotive::vehicle::EvsServiceType; 
using ::aidl::android::hardware::automotive::vehicle::ForwardCollisionWarningState;

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

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

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

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

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

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

using ::aidl::android::hardware::automotive::vehicle::LaneDepartureWarningState;
@@ -230,6 +234,14 @@ JsonValueParser::JsonValueParser() { 
            std::make_unique<ConstantParser<CruiseControlState>>();

    mConstantParsersByType["CruiseControlCommand"] =

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

    mConstantParsersByType["HandsOnDetectionDriverState"] =

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

    mConstantParsersByType["HandsOnDetectionWarning"] =

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

    mConstantParsersByType["DriverAttentionMonitoringState"] =

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

    mConstantParsersByType["DriverAttentionMonitoringWarning"] =

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

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

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

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