Snap for 9459940 from f274c1fbd1cf756991cf376411ac83a6eab02ac3 to udc-release (dd46e085) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvStoppingMode.aidl

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.automotive.vehicle;
		@Backing(type="int") @VintfStability
		enum EvStoppingMode {
		OTHER = 0,
		CREEP = 1,
		ROLL = 2,
		HOLD = 3,
		}

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ enum VehicleProperty {
		IGNITION_STATE = 289408009,
		ABS_ACTIVE = 287310858,
		TRACTION_CONTROL_ACTIVE = 287310859,
		EV_STOPPING_MODE = 289408013,
		HVAC_FAN_SPEED = 356517120,
		HVAC_FAN_DIRECTION = 356517121,
		HVAC_TEMPERATURE_CURRENT = 358614274,
		@@ -240,5 +241,10 @@ enum VehicleProperty {
		FORWARD_COLLISION_WARNING_ENABLED = 287313922,
		BLIND_SPOT_WARNING_ENABLED = 287313924,
		LANE_DEPARTURE_WARNING_ENABLED = 287313926,
		LANE_KEEP_ASSIST_ENABLED = 287313928,
		LANE_CENTERING_ASSIST_ENABLED = 287313930,
		EMERGENCY_LANE_KEEP_ASSIST_ENABLED = 287313933,
		ADAPTIVE_CRUISE_CONTROL_ENABLED = 287313935,
		HANDS_ON_DETECTION_ENABLED = 287313941,
		DRIVER_ATTENTION_MONITORING_ENABLED = 287313944,
		}

automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvStoppingMode.aidl

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.automotive.vehicle;

		/**
		* Used by EV_STOPPING_MODE to enumerate the current state of the stopping mode.
		*
		* This enum may be extended to include more states in the future.
		*/
		@VintfStability
		@Backing(type="int")
		enum EvStoppingMode {
		/**
		* Other EV stopping mode. Ideally, this should never be used.
		*/
		OTHER = 0,
		/**
		* Vehicle slowly moves forward when the brake pedal is released.
		*/
		CREEP = 1,
		/**
		* Vehicle rolls freely when the brake pedal is released (similar to neutral gear).
		*/
		ROLL = 2,
		/**
		* Vehicle stops and holds its position when the brake pedal is released.
		*/
		HOLD = 3,
		}

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

+102 −0

Original line number	Diff line number	Diff line
		@@ -602,6 +602,20 @@ enum VehicleProperty {
		*/
		TRACTION_CONTROL_ACTIVE = 0x040B + 0x10000000 + 0x01000000
		+ 0x00200000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:BOOLEAN
		/**
		* Represents property for the current stopping mode of the vehicle.
		*
		* For the global area ID (0), the VehicleAreaConfig#supportedEnumValues must be defined unless
		* all enum values of EvStoppingMode are supported.
		*
		* The EvStoppingMode enum may be extended to include more states in the future.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		* @data_enum EvStoppingMode
		*/
		EV_STOPPING_MODE =
		0x040D + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,
		/**
		* HVAC Properties
		*
		@@ -3470,6 +3484,26 @@ enum VehicleProperty {
		LANE_DEPARTURE_WARNING_ENABLED =
		0x1006 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/**
		* Enable or disable Lane Keep Assist (LKA).
		*
		* Set true to enable LKA and false to disable LKA. When LKA is enabled, the ADAS system in the
		* vehicle should be turned on and monitoring if the driver unintentionally drifts toward or
		* over the lane marking. If an unintentional lane departure is detected, the system applies
		* steering control to return the vehicle into the current lane.
		*
		* This is different from Lane Centering Assist (LCA) which, when activated, applies continuous
		* steering control to keep the vehicle centered in the current lane.
		*
		* This property is defined as read_write, but OEMs have the option to implement it as read
		* only.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		*/
		LANE_KEEP_ASSIST_ENABLED =
		0x1008 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/**
		* Enable or disable lane centering assist (LCA).
		*
		@@ -3491,6 +3525,74 @@ enum VehicleProperty {
		LANE_CENTERING_ASSIST_ENABLED =
		0x100A + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/*
		* Enable or disable emergency lane keep assist (ELKA).
		*
		* Set true to enable ELKA and false to disable ELKA. When ELKA is enabled, the ADAS system in
		* the vehicle should be on and monitoring for unsafe lane changes by the driver. When an unsafe
		* maneuver is detected, ELKA alerts the driver and applies steering corrections to keep the
		* vehicle in its original lane.
		*
		* This property is defined as read_write, but OEMs have the option to implement it as read
		* only.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		*/
		EMERGENCY_LANE_KEEP_ASSIST_ENABLED =
		0x100D + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/**
		* Enable or disable adaptive cruise control (ACC).
		*
		* Set true to enable ACC and false to disable ACC. When ACC is enabled, the ADAS system in the
		* vehicle should be turned on and waiting for an activation signal from the driver. Once the
		* feature is activated, the ADAS system in the car should be accelerating and braking in a way
		* that allows the vehicle to maintain a set speed and to maintain a set distance gap from a
		* leading vehicle.
		*
		* This property is defined as read_write, but OEMs have the option to implement it as read
		* only.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		*/
		ADAPTIVE_CRUISE_CONTROL_ENABLED =
		0x100F + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/**
		* Enable or disable hands on detection (HOD).
		*
		* Set true to enable HOD and false to disable HOD. When HOD is enabled, a system inside the
		* vehicle should be monitoring the presence of the driver's hands on the steering wheel and
		* send a warning if it detects that the driver's hands are no longer on the steering wheel.
		*
		* This property is defined as read_write, but OEMs have the option to implement it as read
		* only.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		*/
		HANDS_ON_DETECTION_ENABLED =
		0x1015 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/**
		* Enable or disable driver attention monitoring.
		*
		* Set true to enable driver attention monitoring and false to disable driver attention
		* monitoring. When driver attention monitoring is enabled, a system inside the vehicle should
		* be monitoring the attention level of the driver and should send a warning if it detects that
		* the driver is distracted.
		*
		* This property is defined as read_write, but OEMs have the option to implement it as read
		* only.
		*
		* @change_mode VehiclePropertyChangeMode.ON_CHANGE
		* @access VehiclePropertyAccess.READ_WRITE
		*/
		DRIVER_ATTENTION_MONITORING_ENABLED =
		0x1018 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

		/***************************************************************************
		* End of ADAS Properties
		**************************************************************************/

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope
		{VehicleProperty::IGNITION_STATE, VehiclePropertyAccess::READ},
		{VehicleProperty::ABS_ACTIVE, VehiclePropertyAccess::READ},
		{VehicleProperty::TRACTION_CONTROL_ACTIVE, VehiclePropertyAccess::READ},
		{VehicleProperty::EV_STOPPING_MODE, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::HVAC_FAN_SPEED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::HVAC_FAN_DIRECTION, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::HVAC_TEMPERATURE_CURRENT, VehiclePropertyAccess::READ},
		@@ -240,7 +241,12 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope
		{VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::LANE_DEPARTURE_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyAccess::READ_WRITE},
		};

		} // namespace vehicle