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

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

Merge "Added TURN_SIGNAL_LIGHT_STATE and TURN_SIGNAL_SWITCH to HAL" into main

parents eedb6edb f82e4a03

automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json

+19 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ 
                    "VehicleTurnSignal"

                ],

                "data_enum": "VehicleTurnSignal",

                "description": "State of the vehicles turn signals"

                "description": "(Deprecated) State of the vehicles turn signals\nThis property has been deprecated as it ambiguously defines the state of the vehicle turn signals without making clear if it means the state of the turn signal lights or the state of the turn signal switch. The introduction of TURN_SIGNAL_LIGHT_STATE and TURN_SIGNAL_SWITCH rectifies this problem."

            },

            {

                "name": "Represents ignition state",
@@ -324,6 +324,24 @@ 
                "data_enum": "ElectronicStabilityControlState",

                "description": "Electronic Stability Control (ESC) state.\nReturns the current state of ESC. This property must always return a valid state defined in ElectronicStabilityControlState or ErrorState. It must not surface errors through StatusCode and must use the supported error states instead.\nFor the global area ID (0), {@code getSupportedValuesList} must return a {@code SupportedValuesListResult} that contains supported values unless all states of both ElectronicStabilityControlState (including OTHER, which is not recommended) and ErrorState are supported.\nFor backward compatibility, if {@code SupportedValuesListResult} is defined, {@code VehicleAreaConfig#supportedEnumValues} must be set to the same values."

            },

            {

                "name": "Turn signal light state.",

                "value": 289408016,

                "data_enums": [

                    "VehicleTurnSignal"

                ],

                "data_enum": "VehicleTurnSignal",

                "description": "Turn signal light state.\nThis property must communicate the actual state of the turn signal lights.\nExamples: 1) Left turn signal light is currently pulsing, right turn signal light is currently off. This property must return VehicleTurnSignal.LEFT while the light is on during the pulse, and VehicleTurnSignal.NONE when it is off during the pulse. 2) Right turn signal light is currently pulsing, left turn signal light is currently off. This property must return VehicleTurnSignal.RIGHT while the light is on during the pulse, and VehicleTurnSignal.NONE when it is off during the pulse. 3) Both turn signal lights are currently pulsing (e.g. when hazard lights switch is on). This property must return VehicleTurnSignal.LEFT | VehicleTurnSignal.RIGHT while the lights are on during the pulse, and VehicleTurnSignal.NONE when they are off during the pulse.\nNote that this property uses VehicleTurnSignal as a bit flag, unlike TURN_SIGNAL_SWITCH, which uses it like a regular enum. This means this property can support ORed together values in VehicleTurnSignal.\nThis is different from the function of TURN_SIGNAL_SWITCH, which must communicate the state of the turn signal lever\/switch.\nThis property is a replacement to the TURN_SIGNAL_STATE property, which is now deprecated."

            },

            {

                "name": "Turn signal switch.",

                "value": 289408017,

                "data_enums": [

                    "VehicleTurnSignal"

                ],

                "data_enum": "VehicleTurnSignal",

                "description": "Turn signal switch.\nThis property must communicate the state of the turn signal lever\/switch. This is different from the function of TURN_SIGNAL_LIGHT_STATE, which must communicate the actual state of the turn signal lights.\nNote that this property uses VehicleTurnSignal as a regular enum, unlike TURN_SIGNAL_LIGHT_STATE, which uses it like a bit flag. This means this property cannot support ORed together values in VehicleTurnSignal.\nThis property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to implement it as VehiclePropertyAccess.READ only."

            },

            {

                "name": "Fan speed setting",

                "value": 356517120,

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

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::EV_STOPPING_MODE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::TURN_SIGNAL_LIGHT_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::TURN_SIGNAL_SWITCH, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::HVAC_FAN_SPEED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::HVAC_FAN_DIRECTION, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::HVAC_TEMPERATURE_CURRENT, VehiclePropertyAccess::READ},

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

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::EV_STOPPING_MODE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::TURN_SIGNAL_LIGHT_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::TURN_SIGNAL_SWITCH, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::HVAC_FAN_SPEED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::HVAC_FAN_DIRECTION, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::HVAC_TEMPERATURE_CURRENT, VehiclePropertyChangeMode::ON_CHANGE},

automotive/vehicle/aidl/generated_lib/4/cpp/VersionForVehicleProperty.h

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::EV_STOPPING_MODE, 2},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_ENABLED, 3},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_STATE, 3},

        {VehicleProperty::TURN_SIGNAL_LIGHT_STATE, 4},

        {VehicleProperty::TURN_SIGNAL_SWITCH, 4},

        {VehicleProperty::HVAC_FAN_SPEED, 2},

        {VehicleProperty::HVAC_FAN_DIRECTION, 2},

        {VehicleProperty::HVAC_TEMPERATURE_CURRENT, 2},

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

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.EV_STOPPING_MODE, VehiclePropertyAccess.READ_WRITE),

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

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

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

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

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

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

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