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

Commit a6785997 authored by shrikar's avatar shrikar
Browse files

Added HANDS_ON_DETECTION_WARNING to HAL layer. 

Bug: 264946505
Test: atest VtsHalAutomotiveVehicle_TargetTest
Change-Id: Idc807524b06e8001a795d63f9ad2f1294a834a0f
parent 6d88bf5b

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

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {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},

};

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

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {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},

};

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

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

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_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)

    );

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

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

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_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)

    );

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

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ using ::aidl::android::hardware::automotive::vehicle::ForwardCollisionWarningSta 
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;
@@ -233,6 +234,8 @@ JsonValueParser::JsonValueParser() { 
            std::make_unique<ConstantParser<CruiseControlCommand>>();

    mConstantParsersByType["HandsOnDetectionDriverState"] =

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

    mConstantParsersByType["HandsOnDetectionWarning"] =

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

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

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

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