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

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

Merge "Removing DRIVER_ATTENTION_MONITORING properties from HAL layer." into udc-dev

parents e07c6978 dced9c77

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -272,9 +272,6 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyAccess::READ_WRITE},

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

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

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

        {VehicleProperty::HANDS_ON_DETECTION_WARNING, 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

}  // namespace vehicle

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -272,9 +272,6 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

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

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

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

        {VehicleProperty::HANDS_ON_DETECTION_WARNING, 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

}  // namespace vehicle

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -263,10 +263,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_LEAD_VEHICLE_MEASURED_DISTANCE, VehiclePropertyAccess.READ),

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

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_ENABLED, VehiclePropertyAccess.READ_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_DRIVER_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_WARNING, 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 −4
Original line number Original line Diff line number Diff line
@@ -263,10 +263,7 @@ public final class ChangeModeForVehicleProperty { 
        Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_LEAD_VEHICLE_MEASURED_DISTANCE, VehiclePropertyChangeMode.CONTINUOUS),

        Map.entry(VehicleProperty.ADAPTIVE_CRUISE_CONTROL_LEAD_VEHICLE_MEASURED_DISTANCE, VehiclePropertyChangeMode.CONTINUOUS),

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_ENABLED, 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_DRIVER_STATE, VehiclePropertyChangeMode.ON_CHANGE),

        Map.entry(VehicleProperty.HANDS_ON_DETECTION_WARNING, 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

+0 −6
Original line number Original line Diff line number Diff line
@@ -41,8 +41,6 @@ using ::aidl::android::hardware::automotive::vehicle::ChangeModeForVehicleProper 
using ::aidl::android::hardware::automotive::vehicle::CruiseControlCommand;

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

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

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

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

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::EmergencyLaneKeepAssistState;

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

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

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

using ::aidl::android::hardware::automotive::vehicle::EvConnectorType;
@@ -245,10 +243,6 @@ JsonValueParser::JsonValueParser() { 
            std::make_unique<ConstantParser<HandsOnDetectionDriverState>>();

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

    mConstantParsersByType["HandsOnDetectionWarning"] =

    mConstantParsersByType["HandsOnDetectionWarning"] =

            std::make_unique<ConstantParser<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["ErrorState"] = std::make_unique<ConstantParser<ErrorState>>();

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

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

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