Snap for 9730513 from 4816feeb97e9185af99f335ff78588f7c3967ca6 to udc-release (ea887768) · Commits · e / os / android_hardware_interfaces

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

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -3628,7 +3628,7 @@ enum VehicleProperty {
	**********************************************************************************************/		**********************************************************************************************/

	/**		/**
	* Enable or disable automatic emergency braking (AEB).		* Enable or disable Automatic Emergency Braking (AEB).
	*		*
	* Set true to enable AEB and false to disable AEB. When AEB is enabled, the ADAS system in the		* Set true to enable AEB and false to disable AEB. When AEB is enabled, the ADAS system in the
	* vehicle should be turned on and monitoring to avoid potential collisions.		* vehicle should be turned on and monitoring to avoid potential collisions.
	@@ -3670,7 +3670,7 @@ enum VehicleProperty {
	0x1001 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,		0x1001 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

	/**		/**
	* Enable or disable forward collision warning (FCW).		* Enable or disable Forward Collision Warning (FCW).
	*		*
	* Set true to enable FCW and false to disable FCW. When FCW is enabled, the ADAS system in the		* Set true to enable FCW and false to disable FCW. When FCW is enabled, the ADAS system in the
	* vehicle should be turned on and monitoring for potential collisions.		* vehicle should be turned on and monitoring for potential collisions.
	@@ -3709,7 +3709,7 @@ enum VehicleProperty {
	0x1003 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,		0x1003 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

	/**		/**
	* Enable and disable blind spot warning (BSW).		* Enable and disable Blind Spot Warning (BSW).
	*		*
	* Set true to enable BSW and false to disable BSW. When BSW is enabled, the ADAS system in the		* Set true to enable BSW and false to disable BSW. When BSW is enabled, the ADAS system in the
	* vehicle should be turned on and monitoring for objects in the vehicle’s blind spots.		* vehicle should be turned on and monitoring for objects in the vehicle’s blind spots.
	@@ -3748,7 +3748,7 @@ enum VehicleProperty {
	0x1005 + VehiclePropertyGroup.SYSTEM + VehicleArea.MIRROR + VehiclePropertyType.INT32,		0x1005 + VehiclePropertyGroup.SYSTEM + VehicleArea.MIRROR + VehiclePropertyType.INT32,

	/**		/**
	* Enable or disable lane departure warning (LDW).		* Enable or disable Lane Departure Warning (LDW).
	*		*
	* Set true to enable LDW and false to disable LDW. When LDW is enabled, the ADAS system in the		* Set true to enable LDW and false to disable LDW. When LDW is enabled, the ADAS system in the
	* vehicle should be turned on and monitoring if the vehicle is approaching or crossing lane		* vehicle should be turned on and monitoring if the vehicle is approaching or crossing lane
	@@ -3835,7 +3835,7 @@ enum VehicleProperty {
	0x1009 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,		0x1009 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

	/**		/**
	* Enable or disable lane centering assist (LCA).		* Enable or disable Lane Centering Assist (LCA).
	*		*
	* Set true to enable LCA and false to disable LCA. When LCA is enabled, the ADAS system in the		* Set true to enable LCA and false to disable LCA. When LCA is enabled, the ADAS system in the
	* vehicle should be turned on and waiting for an activation signal from the driver. Once the		* vehicle should be turned on and waiting for an activation signal from the driver. Once the
	@@ -3907,7 +3907,7 @@ enum VehicleProperty {
	0x100C + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,		0x100C + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

	/*		/*
	* Enable or disable emergency lane keep assist (ELKA).		* 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		* 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		* the vehicle should be on and monitoring for unsafe lane changes by the driver. When an unsafe
	@@ -4095,7 +4095,7 @@ enum VehicleProperty {
	0x1015 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,		0x1015 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

	/**		/**
	* Enable or disable hands on detection (HOD).		* 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		* 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		* vehicle should be monitoring the presence of the driver's hands on the steering wheel and
	@@ -4115,7 +4115,7 @@ enum VehicleProperty {
	0x1016 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,		0x1016 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,

	/**		/**
	* Hands on detection (HOD) driver state.		* Hands On Detection (HOD) driver state.
	*		*
	* Returns whether the driver's hands are on the steering wheel. Generally, this property should		* Returns whether the driver's hands are on the steering wheel. Generally, this property should
	* return a valid state defined in the HandsOnDetectionDriverState or ErrorState. For example,		* return a valid state defined in the HandsOnDetectionDriverState or ErrorState. For example,
	@@ -4139,7 +4139,7 @@ enum VehicleProperty {
	0x1017 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,		0x1017 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

	/**		/**
	* Hands on detection (HOD) warning.		* Hands On Detection (HOD) warning.
	*		*
	* Returns whether a warning is being sent to the driver for having their hands off the wheel		* Returns whether a warning is being sent to the driver for having their hands off the wheel
	* for too long a duration.		* for too long a duration.

compatibility_matrices/compatibility_matrix.8.xml

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -499,16 +499,6 @@
	<instance>slot3</instance>		<instance>slot3</instance>
	</interface>		</interface>
	</hal>		</hal>
	<hal format="aidl" optional="true">
	<name>android.hardware.radio.satellite</name>
	<version>1</version>
	<interface>
	<name>IRadioSatellite</name>
	<instance>slot1</instance>
	<instance>slot2</instance>
	<instance>slot3</instance>
	</interface>
	</hal>
	<hal format="aidl" optional="true">		<hal format="aidl" optional="true">
	<name>android.hardware.radio.ims.media</name>		<name>android.hardware.radio.ims.media</name>
	<version>1</version>		<version>1</version>

radio/aidl/Android.bp

+0 −16

Original line number	Original line	Diff line number	Diff line
	@@ -262,19 +262,3 @@ aidl_interface {
	},		},
	},		},
	}		}

	aidl_interface {
	name: "android.hardware.radio.satellite",
	vendor_available: true,
	srcs: ["android/hardware/radio/satellite/*.aidl"],
	stability: "vintf",
	imports: ["android.hardware.radio-V2"],
	backend: {
	cpp: {
	enabled: false,
	},
	java: {
	sdk_version: "module_current",
	},
	},
	}

radio/aidl/aidl_api/android.hardware.radio.satellite/current/android/hardware/radio/satellite/IRadioSatellite.aidl

deleted100644 → 0

+0 −53

Original line number	Original line	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.radio.satellite;
	@VintfStability
	interface IRadioSatellite {
	oneway void addAllowedSatelliteContacts(in int serial, in String[] contacts);
	oneway void getCapabilities(in int serial);
	oneway void getMaxCharactersPerTextMessage(in int serial);
	oneway void getPendingMessages(in int serial);
	oneway void getPowerState(in int serial);
	oneway void getSatelliteMode(in int serial);
	oneway void getTimeForNextSatelliteVisibility(in int serial);
	oneway void provisionService(in int serial, in String imei, in String msisdn, in String imsi, in android.hardware.radio.satellite.SatelliteFeature[] features);
	oneway void removeAllowedSatelliteContacts(in int serial, in String[] contacts);
	oneway void responseAcknowledgement();
	oneway void sendMessages(in int serial, in String[] messages, in String destination, in double latitude, in double longitude);
	oneway void setIndicationFilter(in int serial, in int filterBitmask);
	oneway void setPower(in int serial, in boolean on);
	oneway void setResponseFunctions(in android.hardware.radio.satellite.IRadioSatelliteResponse satelliteResponse, in android.hardware.radio.satellite.IRadioSatelliteIndication satelliteIndication);
	oneway void startSendingSatellitePointingInfo(in int serial);
	oneway void stopSendingSatellitePointingInfo(in int serial);
	}

radio/aidl/aidl_api/android.hardware.radio.satellite/current/android/hardware/radio/satellite/IRadioSatelliteIndication.aidl

deleted100644 → 0

+0 −44

Original line number	Original line	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.radio.satellite;
	@VintfStability
	interface IRadioSatelliteIndication {
	oneway void onMessagesTransferComplete(in android.hardware.radio.RadioIndicationType type, in boolean complete);
	oneway void onNewMessages(in android.hardware.radio.RadioIndicationType type, in String[] messages);
	oneway void onPendingMessageCount(in android.hardware.radio.RadioIndicationType type, in int count);
	oneway void onProvisionStateChanged(in android.hardware.radio.RadioIndicationType type, boolean provisioned, in android.hardware.radio.satellite.SatelliteFeature[] features);
	oneway void onSatelliteModeChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.satellite.SatelliteMode mode);
	oneway void onSatellitePointingInfoChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.satellite.PointingInfo pointingInfo);
	oneway void onSatelliteRadioTechnologyChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.satellite.NTRadioTechnology technology);
	}