DO NOT MERGE - Merge Android 13 (65270bba) · Commits · e / os / android_hardware_interfaces

.gitignore

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		.vscode/

audio/aidl/Android.bp

+13 −3

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ aidl_interface {
		"android/hardware/audio/common/SourceMetadata.aidl",
		],
		imports: [
		"android.media.audio.common.types",
		"android.media.audio.common.types-V1",
		],
		stability: "vintf",
		backend: {
		@@ -41,7 +41,12 @@ aidl_interface {
		enabled: true,
		},
		java: {
		platform_apis: true,
		sdk_version: "module_current",
		min_sdk_version: "31",
		apex_available: [
		"//apex_available:platform",
		"com.android.car.framework",
		],
		},
		ndk: {
		apex_available: [
		@@ -51,6 +56,11 @@ aidl_interface {
		min_sdk_version: "31",
		},
		},
		versions: [
		versions_with_info: [
		{
		version: "1",
		imports: ["android.media.audio.common.types-V1"],
		},
		],

		}

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

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		90d0a7ea5cee4579d33066885d8648f180387f55

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

0 → 100644

+43 −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.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/1/android/hardware/audio/common/RecordTrackMetadata.aidl

0 → 100644

+42 −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.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;
		}