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

Commit 28ee23c0 authored by Aaqib Ismail's avatar Aaqib Ismail
Browse files

Add HAL changes for AUTOMATIC_EMERGENCY_BRAKING_STATE 

This property supports error states in addition to its own state.
This is why the comments mention two @data_enums for the property.
This works because states are integer values so as long as all states
have distinct integer values, this functions correctly.

Bug: 264336118
Test: atest VtsHalAutomotiveVehicle_TargetTest
Test: atest CtsCarTestCases:CarPropertyManagerTest
Test: atest CtsCarTestCases:VehiclePropertyIdsTest
Test: atest AutomaticEmergencyBrakingStateTest
Test: atest ErrorStateTest
Change-Id: I6acf5958caf00822b1455915cc715e04453d0bbd
parent 4f2132e3

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

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::SUPPORTED_PROPERTY_IDS, VehiclePropertyAccess::READ},

        {VehicleProperty::SHUTDOWN_REQUEST, VehiclePropertyAccess::WRITE},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::LANE_DEPARTURE_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

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

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::SUPPORTED_PROPERTY_IDS, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::SHUTDOWN_REQUEST, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LANE_DEPARTURE_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

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

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

        Map.entry(VehicleProperty.SHUTDOWN_REQUEST, VehiclePropertyAccess.WRITE),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+5 −0
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ namespace vehicle { 
namespace jsonconfigloader_impl {



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

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

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

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

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

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

using ::aidl::android::hardware::automotive::vehicle::EvsServiceType;
@@ -207,6 +209,9 @@ JsonValueParser::JsonValueParser() { 
    mConstantParsersByType["VehicleIgnitionState"] =

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

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

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

    mConstantParsersByType["AutomaticEmergencyBrakingState"] =

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

    mConstantParsersByType["Constants"] = std::make_unique<LocalVariableParser>();

}