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

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

Merge "Added INFO_MODEL_TRIM to HAL" into main

parents f3dce117 f02d6754

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

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,11 @@ 
                "data_enum": "PortLocationType",

                "description": "Multiple EV port locations\nImplement this property if the vehicle has multiple EV ports. Port locations are defined in PortLocationType. For example, a car has one port in front left and one port in rear left: int32Values[0] = PortLocationType::FRONT_LEFT int32Values[1] = PortLocationType::REAR_LEFT\nIf only one port exists on the vehicle, this property's value should list just one element. See INFO_EV_PORT_LOCATION for describing just one port location."

            },

            {

                "name": "INFO_MODEL_TRIM",

                "value": 286261517,

                "description": "Public trim name of the vehicle.\nThis property must communicate the vehicle's public trim name.\nFor example, say an OEM manufactures two different versions of a vehicle model: \"makeName modelName\" and \"makeName modelName Sport\" This property must be empty for the first vehicle (i.e. base model), and set to \"Sport\" for the second vehicle."

            },

            {

                "name": "PERF_ODOMETER",

                "value": 291504644,

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

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

        {VehicleProperty::INFO_EXTERIOR_DIMENSIONS, VehiclePropertyAccess::READ},

        {VehicleProperty::INFO_MULTI_EV_PORT_LOCATIONS, VehiclePropertyAccess::READ},

        {VehicleProperty::INFO_MODEL_TRIM, VehiclePropertyAccess::READ},

        {VehicleProperty::PERF_ODOMETER, VehiclePropertyAccess::READ},

        {VehicleProperty::PERF_VEHICLE_SPEED, VehiclePropertyAccess::READ},

        {VehicleProperty::PERF_VEHICLE_SPEED_DISPLAY, VehiclePropertyAccess::READ},

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

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

        {VehicleProperty::INFO_EXTERIOR_DIMENSIONS, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::INFO_MULTI_EV_PORT_LOCATIONS, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::INFO_MODEL_TRIM, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::PERF_ODOMETER, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::PERF_VEHICLE_SPEED, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::PERF_VEHICLE_SPEED_DISPLAY, VehiclePropertyChangeMode::CONTINUOUS},

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::INFO_DRIVER_SEAT, 2},

        {VehicleProperty::INFO_EXTERIOR_DIMENSIONS, 2},

        {VehicleProperty::INFO_MULTI_EV_PORT_LOCATIONS, 2},

        {VehicleProperty::INFO_MODEL_TRIM, 4},

        {VehicleProperty::PERF_ODOMETER, 2},

        {VehicleProperty::PERF_VEHICLE_SPEED, 2},

        {VehicleProperty::PERF_VEHICLE_SPEED_DISPLAY, 2},

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

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

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

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

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

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

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

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