Merge "Revert "Freeze android.hardware.audio.* interfaces for 202504"" into main (435186a9) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+4 −33

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ aidl_interface {
		"android/hardware/audio/common/SinkMetadata.aidl",
		"android/hardware/audio/common/SourceMetadata.aidl",
		],
		frozen: true,
		frozen: false,
		backend: {
		cpp: {
		enabled: true,
		@@ -81,10 +81,6 @@ aidl_interface {
		version: "3",
		imports: ["android.media.audio.common.types-V3"],
		},
		{
		version: "4",
		imports: ["android.media.audio.common.types-V4"],
		},

		// IMPORTANT: Update latest_android_hardware_audio_common every time you
		// add the latest frozen version to versions_with_info
		@@ -198,22 +194,11 @@ aidl_interface {
		"android.hardware.common.fmq-V1",
		],
		},
		{
		version: "3",
		imports: [
		"android.media.audio.common.types-V4",
		"android.hardware.audio.effect-V3",
		"android.hardware.audio.core.sounddose-V3",
		"android.hardware.audio.common-V4",
		"android.hardware.common-V2",
		"android.hardware.common.fmq-V1",
		],
		},

		// IMPORTANT: Update latest_android_hardware_audio_core every time you
		// add the latest frozen version to versions_with_info
		],
		frozen: true,
		frozen: false,
		}

		// Note: This should always be one version ahead of the last frozen version
		@@ -278,15 +263,11 @@ aidl_interface {
		version: "2",
		imports: ["android.media.audio.common.types-V3"],
		},
		{
		version: "3",
		imports: ["android.media.audio.common.types-V4"],
		},

		// IMPORTANT: Update latest_android_hardware_audio_core_sounddose every time you
		// add the latest frozen version to versions_with_info
		],
		frozen: true,
		frozen: false,
		}

		// Note: This should always be one version ahead of the last frozen version
		@@ -394,19 +375,9 @@ aidl_interface {
		"android.hardware.common.fmq-V1",
		],
		},
		{
		version: "3",
		imports: [
		"android.media.audio.eraser.types-V1",
		"android.media.audio.common.types-V4",
		"android.hardware.audio.common-V4",
		"android.hardware.common-V2",
		"android.hardware.common.fmq-V1",
		],
		},

		],
		frozen: true,
		frozen: false,

		}

audio/aidl/aidl_api/android.hardware.audio.common/4/.hash

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		0ee71d2de1a8f272238a96f6da793744e6dd3e60

audio/aidl/aidl_api/android.hardware.audio.common/4/android/hardware/audio/common/AudioOffloadMetadata.aidl

deleted100644 → 0

+0 −42

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.hardware.audio.common;
		@JavaDerive(equals=true, toString=true) @VintfStability
		parcelable AudioOffloadMetadata {
		int sampleRate;
		android.media.audio.common.AudioChannelLayout channelMask;
		int averageBitRatePerSecond;
		int delayFrames;
		int paddingFrames;
		}

audio/aidl/aidl_api/android.hardware.audio.common/4/android/hardware/audio/common/PlaybackTrackMetadata.aidl

deleted100644 → 0

+0 −43

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.audio.common;
		@JavaDerive(equals=true, toString=true) @VintfStability
		parcelable PlaybackTrackMetadata {
		android.media.audio.common.AudioUsage usage = android.media.audio.common.AudioUsage.INVALID;
		android.media.audio.common.AudioContentType contentType = android.media.audio.common.AudioContentType.UNKNOWN;
		float gain;
		android.media.audio.common.AudioChannelLayout channelMask;
		@nullable android.media.audio.common.AudioDevice sourceDevice;
		@utf8InCpp String[] tags;
		}

audio/aidl/aidl_api/android.hardware.audio.common/4/android/hardware/audio/common/RecordTrackMetadata.aidl

deleted100644 → 0

+0 −42

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.audio.common;
		@JavaDerive(equals=true, toString=true) @VintfStability
		parcelable RecordTrackMetadata {
		android.media.audio.common.AudioSource source = android.media.audio.common.AudioSource.SYS_RESERVED_INVALID;
		float gain;
		@nullable android.media.audio.common.AudioDevice destinationDevice;
		android.media.audio.common.AudioChannelLayout channelMask;
		@utf8InCpp String[] tags;
		}