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

Commit 22164c6b authored by shrikar's avatar shrikar
Browse files

Added DRIVER_ATTENTION_MONITORING_STATE to HAL layer. 

Bug: 264946416
Test: atest VtsHalAutomotiveVehicle_TargetTest
Change-Id: Ie68b718d719dc5de050d31f6dd614ce5e9ecb32c
parent 39859e91

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

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

};

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

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

};

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

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ public final class AccessForVehicleProperty { 
        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

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ public final class ChangeModeForVehicleProperty { 
        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

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 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;
@@ -237,6 +238,8 @@ JsonValueParser::JsonValueParser() { 
            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>>();