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

Commit 28224192 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topics "GloveBoxLocked", "GloveBoxOpened" 

* changes:
  Add HAL changes for GLOVE_BOX_LOCKED
  Add HAL changes for GLOVE_BOX_DOOR_POS
parents 732a1d77 57be4038

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

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

        {VehicleProperty::STEERING_WHEEL_LOCKED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::STEERING_WHEEL_EASY_ACCESS_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::GLOVE_BOX_DOOR_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::GLOVE_BOX_LOCKED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::VEHICLE_MAP_SERVICE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::OBD2_LIVE_FRAME, VehiclePropertyAccess::READ},

        {VehicleProperty::OBD2_FREEZE_FRAME, VehiclePropertyAccess::READ},

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

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

        {VehicleProperty::STEERING_WHEEL_LOCKED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::STEERING_WHEEL_EASY_ACCESS_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::GLOVE_BOX_DOOR_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::GLOVE_BOX_LOCKED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::VEHICLE_MAP_SERVICE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::OBD2_LIVE_FRAME, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::OBD2_FREEZE_FRAME, VehiclePropertyChangeMode::ON_CHANGE},

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

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

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

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

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

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

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ public final class ChangeModeForVehicleProperty { 
        Map.entry(VehicleProperty.STEERING_WHEEL_THEFT_LOCK_ENABLED, VehiclePropertyChangeMode.ON_CHANGE),

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

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

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

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

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

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

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

automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json

+28 −0
Original line number Diff line number Diff line
@@ -2777,6 +2777,34 @@ 
                ]

            }

        },

        {

            "property": "VehicleProperty::GLOVE_BOX_DOOR_POS",

            "defaultValue": {

                "int32Values": [

                    0

                ]

            },

            "areas": [

                {

                    "areaId": "Constants::SEAT_1_RIGHT",

                    "minInt32Value": 0,

                    "maxInt32Value": 10

                }

            ]

        },

        {

            "property": "VehicleProperty::GLOVE_BOX_LOCKED",

            "defaultValue": {

                "int32Values": [

                    0

                ]

            },

            "areas": [

                {

                    "areaId": "Constants::SEAT_1_RIGHT"

                }

            ]

        },

        {

            "property": "VehicleProperty::WHEEL_TICK",

            "defaultValue": {