Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 914dc1db authored by Alice Kuo's avatar Alice Kuo Committed by Automerger Merge Worker
Browse files

Add le audio capabilities and audio config update supported in aidl am: 60b00151

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1942861

Change-Id: I6a0d4eed3c4b844ac1ff929435c73c0864a59ee5
parents 243d10fe 60b00151
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -36,5 +36,5 @@ package android.hardware.bluetooth.audio;
union AudioCapabilities {
  android.hardware.bluetooth.audio.PcmCapabilities pcmCapabilities;
  android.hardware.bluetooth.audio.CodecCapabilities codecCapabilities;
  android.hardware.bluetooth.audio.LeAudioCapabilities leAudioCapabilities;
  android.hardware.bluetooth.audio.LeAudioCodecCapabilitiesSetting leAudioCapabilities;
}
+50 −0
Original line number Diff line number Diff line
/*
 * Copyright 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.bluetooth.audio;
@VintfStability
parcelable BroadcastCapability {
  android.hardware.bluetooth.audio.CodecType codecType;
  android.hardware.bluetooth.audio.AudioLocation supportedChannel;
  int channelCountPerStream;
  android.hardware.bluetooth.audio.BroadcastCapability.LeAudioCodecCapabilities leAudioCodecCapabilities;
  @VintfStability
  parcelable VendorCapabilities {
    ParcelableHolder extension;
  }
  @VintfStability
  union LeAudioCodecCapabilities {
    @nullable android.hardware.bluetooth.audio.Lc3Capabilities[] lc3Capabilities;
    @nullable android.hardware.bluetooth.audio.BroadcastCapability.VendorCapabilities[] vendorCapabillities;
  }
}
+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ parcelable BroadcastConfiguration {
  parcelable BroadcastStreamMap {
    char streamHandle;
    int audioChannelAllocation;
    android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCondecConfig;
    android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCodecConfig;
  }
}
+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ interface IBluetoothAudioProvider {
  android.hardware.common.fmq.MQDescriptor<byte,android.hardware.common.fmq.SynchronizedReadWrite> startSession(in android.hardware.bluetooth.audio.IBluetoothAudioPort hostIf, in android.hardware.bluetooth.audio.AudioConfiguration audioConfig);
  void streamStarted(in android.hardware.bluetooth.audio.BluetoothAudioStatus status);
  void streamSuspended(in android.hardware.bluetooth.audio.BluetoothAudioStatus status);
  void updateAudioConfiguration(in android.hardware.bluetooth.audio.AudioConfiguration audioConfig);
}
+40 −0
Original line number Diff line number Diff line
/*
 * Copyright 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.bluetooth.audio;
@VintfStability
parcelable LeAudioCodecCapabilitiesSetting {
  android.hardware.bluetooth.audio.UnicastCapability unicastEncodeCapability;
  android.hardware.bluetooth.audio.UnicastCapability unicastDecodeCapability;
  android.hardware.bluetooth.audio.BroadcastCapability broadcastCapability;
}
Loading