Merge "Make 'IHalAdapterVendorExtension' unstable again" into main (07be6481) · Commits · e / os / android_frameworks_av

Android.bp

+1 −24

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ cc_library_headers {

		aidl_interface {
		name: "av-audio-types-aidl",
		unstable: true,
		host_supported: true,
		vendor_available: true,
		double_loadable: true,
		@@ -154,28 +155,4 @@ aidl_interface {
		sdk_version: "module_current",
		},
		},
		versions_with_info: [
		{
		version: "1",
		imports: ["android.hardware.audio.core-V2"],
		},
		],
		frozen: false,

		}

		latest_av_audio_types_aidl = "av-audio-types-aidl-V2"

		cc_defaults {
		name: "latest_av_audio_types_aidl_ndk_shared",
		shared_libs: [
		latest_av_audio_types_aidl + "-ndk",
		],
		}

		cc_defaults {
		name: "latest_av_audio_types_aidl_ndk_static",
		static_libs: [
		latest_av_audio_types_aidl + "-ndk",
		],
		}

aidl_api/av-audio-types-aidl/1/.hash

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		ef1bc5ed9db445fbfc116cdec6e6ad081458ee40

aidl_api/av-audio-types-aidl/1/android/media/audio/IHalAdapterVendorExtension.aidl

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.media.audio;
		/* @hide */
		interface IHalAdapterVendorExtension {
		@utf8InCpp String[] parseVendorParameterIds(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeys);
		void parseVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeysAndValues, out android.hardware.audio.core.VendorParameter[] syncParameters, out android.hardware.audio.core.VendorParameter[] asyncParameters);
		android.hardware.audio.core.VendorParameter[] parseBluetoothA2dpReconfigureOffload(in @utf8InCpp String rawValue);
		android.hardware.audio.core.VendorParameter[] parseBluetoothLeReconfigureOffload(in @utf8InCpp String rawValue);
		@utf8InCpp String processVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in android.hardware.audio.core.VendorParameter[] parameters);
		enum ParameterScope {
		MODULE = 0,
		STREAM = 1,
		}
		}

aidl_api/av-audio-types-aidl/current/android/media/audio/IHalAdapterVendorExtension.aidl

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.media.audio;
		/* @hide */
		interface IHalAdapterVendorExtension {
		@utf8InCpp String[] parseVendorParameterIds(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeys);
		void parseVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeysAndValues, out android.hardware.audio.core.VendorParameter[] syncParameters, out android.hardware.audio.core.VendorParameter[] asyncParameters);
		android.hardware.audio.core.VendorParameter[] parseBluetoothA2dpReconfigureOffload(in @utf8InCpp String rawValue);
		android.hardware.audio.core.VendorParameter[] parseBluetoothLeReconfigureOffload(in @utf8InCpp String rawValue);
		@utf8InCpp String processVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in android.hardware.audio.core.VendorParameter[] parameters);
		enum ParameterScope {
		MODULE = 0,
		STREAM = 1,
		}
		}

media/libaudiohal/impl/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,11 +201,11 @@ cc_defaults {
		"latest_android_hardware_audio_core_sounddose_ndk_shared",
		"latest_android_hardware_audio_effect_ndk_shared",
		"latest_android_media_audio_common_types_ndk_shared",
		"latest_av_audio_types_aidl_ndk_shared",
		],
		shared_libs: [
		"android.hardware.common-V2-ndk",
		"android.hardware.common.fmq-V1-ndk",
		"av-audio-types-aidl-ndk",
		"libaudio_aidl_conversion_common_cpp",
		"libaudio_aidl_conversion_common_ndk",
		"libaudio_aidl_conversion_common_ndk_cpp",