Merge changes from topic "bt-broadcast-aidl" am: b8e8c57ac6 am: b5c7afe32c am: d3acb83474 (30a3ed75) · Commits · e / os / android_hardware_interfaces

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/AudioConfiguration.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,4 +37,5 @@ union AudioConfiguration {
		android.hardware.bluetooth.audio.PcmConfiguration pcmConfig;
		android.hardware.bluetooth.audio.CodecConfiguration a2dpConfig;
		android.hardware.bluetooth.audio.LeAudioConfiguration leAudioConfig;
		android.hardware.bluetooth.audio.LeAudioBroadcastConfiguration leAudioBroadcastConfig;
		}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/BroadcastConfiguration.aidl→bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl

+3 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,9 @@

		package android.hardware.bluetooth.audio;
		@VintfStability
		parcelable BroadcastConfiguration {
		android.hardware.bluetooth.audio.BroadcastConfiguration.BroadcastStreamMap[] streamMap;
		parcelable LeAudioBroadcastConfiguration {
		android.hardware.bluetooth.audio.CodecType codecType;
		android.hardware.bluetooth.audio.LeAudioBroadcastConfiguration.BroadcastStreamMap[] streamMap;
		@VintfStability
		parcelable BroadcastStreamMap {
		char streamHandle;

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioConfiguration.aidl

+6 −5

Original line number	Diff line number	Diff line
		@@ -34,12 +34,13 @@
		package android.hardware.bluetooth.audio;
		@VintfStability
		parcelable LeAudioConfiguration {
		android.hardware.bluetooth.audio.LeAudioMode mode;
		android.hardware.bluetooth.audio.LeAudioConfiguration.LeAudioModeConfig modeConfig;
		android.hardware.bluetooth.audio.CodecType codecType;
		android.hardware.bluetooth.audio.LeAudioConfiguration.StreamMap[] streamMap;
		int peerDelayUs;
		android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCodecConfig;
		@VintfStability
		union LeAudioModeConfig {
		android.hardware.bluetooth.audio.UnicastConfiguration unicastConfig;
		android.hardware.bluetooth.audio.BroadcastConfiguration broadcastConfig;
		parcelable StreamMap {
		char streamHandle;
		int audioChannelAllocation;
		}
		}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioMode.aidl

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		/*
		* Copyright 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.bluetooth.audio;
		@Backing(type="byte") @VintfStability
		enum LeAudioMode {
		UNKNOWN = 0,
		UNICAST = 1,
		BROADCAST = 2,
		}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/SessionType.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,6 @@ enum SessionType {
		LE_AUDIO_SOFTWARE_DECODING_DATAPATH = 5,
		LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH = 6,
		LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH = 7,
		LE_AUDIO_BROADCAST_SOFTWARE_ENCODING_DATAPATH = 8,
		LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH = 9,
		}