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

Commit 2627773e authored by Tyler Trephan's avatar Tyler Trephan Committed by Android (Google) Code Review
Browse files

Merge changes from topics "prop10", "prop11", "prop12", "prop13", "prop14",... 

Merge changes from topics "prop10", "prop11", "prop12", "prop13", "prop14", "prop8", "prop9" into main

* changes:
  Added VEHICLE_PASSIVE_SUSPENSION_HEIGHT to HAL
  Added BRAKE_FLUID_LEVEL_LOW to HAL
  Added BRAKE_PAD_WEAR_PERCENTAGE to HAL
  Added BRAKE_PEDAL_COMPRESSION_PERCENTAGE to HAL
  Added ACCELERATOR_PEDAL_COMPRESSION_PERCENTAGE to HAL
  Added VEHICLE_DRIVING_AUTOMATION_TARGET_LEVEL to HAL
  Added VEHICLE_HORN_ENGAGED to HAL
parents 7cbdcc52 bda042a7

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

+40 −1
Original line number Diff line number Diff line
@@ -225,6 +225,31 @@ 
                "value": 392168202,

                "description": "Critically low tire pressure\nThis property indicates the critically low pressure threshold for each tire. It indicates when it is time for tires to be replaced or fixed. The value must be less than or equal to minFloatValue in TIRE_PRESSURE. Minimum and maximum property values (that is, minFloatValue, maxFloatValue) are not applicable to this property."

            },

            {

                "name": "ACCELERATOR_PEDAL_COMPRESSION_PERCENTAGE",

                "value": 291504911,

                "description": "Accelerator pedal compression percentage.\nThis property must communicate the percentage that the physical accelerator pedal in the vehicle is compressed. This property must return a float value from 0 to 100.\n0 indicates the pedal is not compressed. 100 indicates the pedal is maximally compressed."

            },

            {

                "name": "BRAKE_PEDAL_COMPRESSION_PERCENTAGE",

                "value": 291504912,

                "description": "Brake pedal compression percentage.\nThis property must communicate the percentage that the physical brake pedal in the vehicle is compressed. This property must return a float value from 0 to 100.\n0 indicates the pedal is not compressed. 100 indicates the pedal is maximally compressed."

            },

            {

                "name": "Brake pad wear percentage.",

                "value": 392168209,

                "description": "Brake pad wear percentage.\nThis property must communicate the amount of brake pad wear accumulated by the vehicle as a percentage. This property return a float value from 0 to 100.\n0 indicates the brake pad has no wear. 100 indicates the brake pad is maximally worn."

            },

            {

                "name": "Brake fluid low.",

                "value": 287310610,

                "description": "Brake fluid low.\nThis property must communicate that the brake fluid level in the vehicle is low according to the OEM. This property must match the vehicle's brake fluid level status as displayed on the instrument cluster. If the brake fluid level is low, this property must be set to true. If not, it must be set to false."

            },

            {

                "name": "VEHICLE_PASSIVE_SUSPENSION_HEIGHT",

                "value": 390071059,

                "description": "Vehicle Passive Suspension Height in mm.\nThis property must communicate the real-time suspension displacement of the vehicle relative to its neutral position, given in mm. In other words, the displacement of the suspension at any given point in time relative to the suspension's position when the vehicle is on a flat surface with no passengers or cargo. When the suspension is compressed in comparison to the neutral position, the value should be negative. When the suspension is decompressed in comparison to the neutral position, the value should be positive.\nExamples for further clarity: 1) Suppose the user is driving on a smooth flat surface, and all wheels are currently compressed by 2 cm in comparison to the default suspension height. In this scenario, this property must be set to -20 for all wheels. 2) Suppose the user drives over a pothole. While the front left wheel is over the pothole, it's decompressed by 3 cm in comparison to the rest of the wheels, or 1 cm in comparison to the default suspension height. All the others are still compressed by 2 cm. In this scenario, this property must be set to -20 for all wheels except for the front left, which must be set to 10.\nHasSupportedValueInfo.hasMinSupportedValue and HasSupportedValueInfo.hasMaxSupportedValue must be true for all areas.\nMinMaxSupportedValueResult.minSupportedValue represents the lower bound of the suspension height for the wheel at the specified area ID.\nMinMaxSupportedValueResult.maxSupportedValue represents the upper bound of the suspension height for the wheel at the specified area ID."

            },

            {

                "name": "ENGINE_IDLE_AUTO_STOP_ENABLED",

                "value": 287310624,
@@ -239,6 +264,11 @@ 
                "data_enum": "ImpactSensorLocation",

                "description": "Impact detected.\nBit flag property to relay information on whether an impact has occurred on a particular side of the vehicle as described through the ImpactSensorLocation enum. As a bit flag property, this property can be set to multiple ORed together values of the enum when necessary.\nFor the global area ID (0), {@code getSupportedValuesList} must return a {@code SupportedValuesListResult} that contains supported values unless all bit flags of ImpactSensorLocation are supported.\nFor backward compatibility, if {@code SupportedValuesListResult} is defined, {@code VehicleAreaConfig#supportedEnumValues} must be set to the same values."

            },

            {

                "name": "Vehicle horn engaged.",

                "value": 287310656,

                "description": "Vehicle horn engaged.\nThis property must communicate if the vehicle's horn is currently engaged or not. If true, the horn is engaged. If false, the horn is disengaged."

            },

            {

                "name": "Currently selected gear",

                "value": 289408000,
@@ -1398,7 +1428,16 @@ 
                    "VehicleAutonomousState"

                ],

                "data_enum": "VehicleAutonomousState",

                "description": "Current state of vehicle autonomy.\nDefines the level of autonomy currently engaged in the vehicle from the J3016_202104 revision of the SAE standard levels 0-5, with 0 representing no autonomy and 5 representing full driving automation. These levels should be used in accordance with the standards defined in https:\/\/www.sae.org\/standards\/content\/j3016_202104\/ and https:\/\/www.sae.org\/blog\/sae-j3016-update\nFor the global area ID (0), the VehicleAreaConfig#supportedEnumValues array must be defined unless all states of VehicleAutonomousState are supported."

                "description": "Current state of vehicle autonomy.\nDefines the level of autonomy currently engaged in the vehicle from the J3016_202104 revision of the SAE standard levels 0-5, with 0 representing no autonomy and 5 representing full driving automation.\nFor the global area ID (0), the VehicleAreaConfig#supportedEnumValues array must be defined unless all states of VehicleAutonomousState are supported."

            },

            {

                "name": "VEHICLE_DRIVING_AUTOMATION_TARGET_LEVEL",

                "value": 289410895,

                "data_enums": [

                    "VehicleAutonomousState"

                ],

                "data_enum": "VehicleAutonomousState",

                "description": "Target state of vehicle autonomy.\nDefines the level of autonomy being targeted by the vehicle from the J3016_202104 revision of the SAE standard levels 0-5, with 0 representing no autonomy and 5 representing full driving automation.\nFor example, suppose the vehicle is currently in a Level 3 state of automation and wants to give the driver full manual control (i.e. Level 0) as soon as it's safe to do so. In this scenario, this property must be set to VehicleAutonomousState.LEVEL_0. Similarly, if the vehicle is currently in Level 1 state of automation and wants to go up to Level 2, this property must be set to VehicleAutonomousState.LEVEL_2. If the vehicle has already reached and is currently in the target level of autonomy, this property must be equal to the value of VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL.\nFor the global area ID (0), the SupportedValuesListResult#supportedValuesList array must be defined unless all states of VehicleAutonomousState are supported. These values must match the values in supportedValuesList of VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL.\nFor the property that communicates the current state of autonomy, see VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL."

            },

            {

                "name": "CAMERA_SERVICE_CURRENT_STATE",

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

+7 −0
Original line number Diff line number Diff line
@@ -74,8 +74,14 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::EV_BATTERY_AVERAGE_TEMPERATURE, VehiclePropertyAccess::READ},

        {VehicleProperty::TIRE_PRESSURE, VehiclePropertyAccess::READ},

        {VehicleProperty::CRITICALLY_LOW_TIRE_PRESSURE, VehiclePropertyAccess::READ},

        {VehicleProperty::ACCELERATOR_PEDAL_COMPRESSION_PERCENTAGE, VehiclePropertyAccess::READ},

        {VehicleProperty::BRAKE_PEDAL_COMPRESSION_PERCENTAGE, VehiclePropertyAccess::READ},

        {VehicleProperty::BRAKE_PAD_WEAR_PERCENTAGE, VehiclePropertyAccess::READ},

        {VehicleProperty::BRAKE_FLUID_LEVEL_LOW, VehiclePropertyAccess::READ},

        {VehicleProperty::VEHICLE_PASSIVE_SUSPENSION_HEIGHT, VehiclePropertyAccess::READ},

        {VehicleProperty::ENGINE_IDLE_AUTO_STOP_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::IMPACT_DETECTED, VehiclePropertyAccess::READ},

        {VehicleProperty::VEHICLE_HORN_ENGAGED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::GEAR_SELECTION, VehiclePropertyAccess::READ},

        {VehicleProperty::CURRENT_GEAR, VehiclePropertyAccess::READ},

        {VehicleProperty::PARKING_BRAKE_ON, VehiclePropertyAccess::READ},
@@ -268,6 +274,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::VEHICLE_IN_USE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::CLUSTER_HEARTBEAT, VehiclePropertyAccess::WRITE},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, VehiclePropertyAccess::READ},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_TARGET_LEVEL, VehiclePropertyAccess::READ},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, VehiclePropertyAccess::WRITE},

        {VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyAccess::READ},

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

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

+7 −0
Original line number Diff line number Diff line
@@ -74,8 +74,14 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::EV_BATTERY_AVERAGE_TEMPERATURE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::TIRE_PRESSURE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::CRITICALLY_LOW_TIRE_PRESSURE, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::ACCELERATOR_PEDAL_COMPRESSION_PERCENTAGE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::BRAKE_PEDAL_COMPRESSION_PERCENTAGE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::BRAKE_PAD_WEAR_PERCENTAGE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::BRAKE_FLUID_LEVEL_LOW, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::VEHICLE_PASSIVE_SUSPENSION_HEIGHT, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::ENGINE_IDLE_AUTO_STOP_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::IMPACT_DETECTED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::VEHICLE_HORN_ENGAGED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::GEAR_SELECTION, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CURRENT_GEAR, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::PARKING_BRAKE_ON, VehiclePropertyChangeMode::ON_CHANGE},
@@ -268,6 +274,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::VEHICLE_IN_USE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CLUSTER_HEARTBEAT, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_TARGET_LEVEL, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyChangeMode::STATIC},

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

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

+7 −0
Original line number Diff line number Diff line
@@ -73,8 +73,14 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::EV_BATTERY_AVERAGE_TEMPERATURE, 3},

        {VehicleProperty::TIRE_PRESSURE, 2},

        {VehicleProperty::CRITICALLY_LOW_TIRE_PRESSURE, 2},

        {VehicleProperty::ACCELERATOR_PEDAL_COMPRESSION_PERCENTAGE, 4},

        {VehicleProperty::BRAKE_PEDAL_COMPRESSION_PERCENTAGE, 4},

        {VehicleProperty::BRAKE_PAD_WEAR_PERCENTAGE, 4},

        {VehicleProperty::BRAKE_FLUID_LEVEL_LOW, 4},

        {VehicleProperty::VEHICLE_PASSIVE_SUSPENSION_HEIGHT, 4},

        {VehicleProperty::ENGINE_IDLE_AUTO_STOP_ENABLED, 2},

        {VehicleProperty::IMPACT_DETECTED, 3},

        {VehicleProperty::VEHICLE_HORN_ENGAGED, 4},

        {VehicleProperty::GEAR_SELECTION, 2},

        {VehicleProperty::CURRENT_GEAR, 2},

        {VehicleProperty::PARKING_BRAKE_ON, 2},
@@ -267,6 +273,7 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::VEHICLE_IN_USE, 2},

        {VehicleProperty::CLUSTER_HEARTBEAT, 3},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, 3},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_TARGET_LEVEL, 4},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, 3},

        {VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS, 3},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, 2},

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

+7 −0
Original line number Diff line number Diff line
@@ -67,8 +67,14 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.EV_BATTERY_AVERAGE_TEMPERATURE, VehiclePropertyAccess.READ),

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

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

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

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

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

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

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

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

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

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

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

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

        Map.entry(VehicleProperty.PARKING_BRAKE_ON, VehiclePropertyAccess.READ),
@@ -261,6 +267,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.VEHICLE_IN_USE, VehiclePropertyAccess.READ_WRITE),

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

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

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

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

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

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