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

Commit 9c38c561 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed defined versions for new Android V vehicle properties" into main

parents 3760f096 10cc332c

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

+4 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::TRACTION_CONTROL_ACTIVE, 2},

        {VehicleProperty::EV_STOPPING_MODE, 2},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_ENABLED, 3},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_STATE, 2},

        {VehicleProperty::ELECTRONIC_STABILITY_CONTROL_STATE, 3},

        {VehicleProperty::HVAC_FAN_SPEED, 2},

        {VehicleProperty::HVAC_FAN_DIRECTION, 2},

        {VehicleProperty::HVAC_TEMPERATURE_CURRENT, 2},
@@ -172,8 +172,8 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::SEAT_FOOTWELL_LIGHTS_STATE, 2},

        {VehicleProperty::SEAT_FOOTWELL_LIGHTS_SWITCH, 2},

        {VehicleProperty::SEAT_EASY_ACCESS_ENABLED, 2},

        {VehicleProperty::SEAT_AIRBAG_ENABLED, 3},

        {VehicleProperty::SEAT_AIRBAGS_DEPLOYED, 2},

        {VehicleProperty::SEAT_AIRBAG_ENABLED, 2},

        {VehicleProperty::SEAT_AIRBAGS_DEPLOYED, 3},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_POS, 2},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_MOVE, 2},

        {VehicleProperty::SEAT_LUMBAR_VERTICAL_POS, 2},
@@ -293,7 +293,7 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::DRIVER_DROWSINESS_ATTENTION_WARNING, 3},

        {VehicleProperty::DRIVER_DISTRACTION_SYSTEM_ENABLED, 3},

        {VehicleProperty::DRIVER_DISTRACTION_STATE, 3},

        {VehicleProperty::DRIVER_DISTRACTION_WARNING_ENABLED, 2},

        {VehicleProperty::DRIVER_DISTRACTION_WARNING_ENABLED, 3},

        {VehicleProperty::DRIVER_DISTRACTION_WARNING, 3},

        {VehicleProperty::LOW_SPEED_COLLISION_WARNING_ENABLED, 3},

        {VehicleProperty::LOW_SPEED_COLLISION_WARNING_STATE, 3},

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl

+4 −4
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ enum VehicleProperty { 
     * @access VehiclePropertyAccess.READ

     * @data_enum ElectronicStabilityControlState

     * @data_enum ErrorState

     * @version 2

     * @version 3

     */

    ELECTRONIC_STABILITY_CONTROL_STATE =

            0x040F + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,
@@ -2909,7 +2909,7 @@ enum VehicleProperty { 
     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     * @access VehiclePropertyAccess.READ

     * @version 3

     * @version 2

     */

    SEAT_AIRBAG_ENABLED =

            0x0B9E + VehiclePropertyGroup.SYSTEM + VehicleArea.SEAT + VehiclePropertyType.BOOLEAN,
@@ -2932,7 +2932,7 @@ enum VehicleProperty { 
     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ

     * @data_enum VehicleAirbagLocation

     * @version 2

     * @version 3

     */

    SEAT_AIRBAGS_DEPLOYED =

            0x0BA5 + VehiclePropertyGroup.SYSTEM + VehicleArea.SEAT + VehiclePropertyType.INT32,
@@ -5868,7 +5868,7 @@ enum VehicleProperty { 
     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     * @access VehiclePropertyAccess.READ

     * @version 2

     * @version 3

     */

    DRIVER_DISTRACTION_WARNING_ENABLED =

            0x101F + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,