Merge "[AOSP Ims] Merge Ims and ImsMedia HAL from 'main-ims-dev' to 'master' branch" (5221f90e) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+18 −0

Original line number	Diff line number	Diff line
		@@ -506,6 +506,16 @@
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.ims</name>
		<version>1</version>
		<interface>
		<name>IRadioIms</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.radio</name>
		<version>1.2</version>
		@@ -514,6 +524,14 @@
		<instance>slot1</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.ims.media</name>
		<version>1</version>
		<interface>
		<name>IImsMedia</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.renderscript</name>
		<version>1.0</version>

radio/aidl/Android.bp

+34 −0

Original line number	Diff line number	Diff line
		@@ -203,3 +203,37 @@ aidl_interface {
		],

		}

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

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

radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/AmrMode.aidl

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.ims.media;
		@Backing(type="int") @VintfStability
		enum AmrMode {
		AMR_MODE_0 = 1 << 0,
		AMR_MODE_1 = 1 << 1,
		AMR_MODE_2 = 1 << 2,
		AMR_MODE_3 = 1 << 3,
		AMR_MODE_4 = 1 << 4,
		AMR_MODE_5 = 1 << 5,
		AMR_MODE_6 = 1 << 6,
		AMR_MODE_7 = 1 << 7,
		AMR_MODE_8 = 1 << 8,
		}

radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/AmrParams.aidl

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.ims.media;
		@VintfStability
		parcelable AmrParams {
		android.hardware.radio.ims.media.AmrMode amrMode;
		boolean octetAligned;
		int maxRedundancyMillis;
		}

radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/AnbrBitrate.aidl

0 → 100644

+40 −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.radio.ims.media;
		@VintfStability
		parcelable AnbrBitrate {
		int uplinkBps;
		int downlinkBps;
		const int INVALID_ANBR_BITRATE = -1;
		}