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

Commit 8acbbe8d authored Oct 23, 2024 by shrikar

Added VEHICLE_DRIVING_AUTOMATION_TARGET_LEVEL to HAL

Bug: 374760391
Test: atest VtsHalAutomotiveVehicle_TargetTest
Change-Id: Id5ac42ba44304fd6a34e9bf7a67a5dd2c1a9f6f7

parent 042f410d

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -1403,7 +1403,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

+1 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,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

+1 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,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

+1 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,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

+1 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,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),