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

Commit c3790fe0 authored by Antoine Soulier's avatar Antoine Soulier Committed by Gerrit Code Review
Browse files

Merge changes I9f6bb947,Iff72dbea into main 

* changes:
  AIDL API Review changes
  A2DP HAL Reference Implementation: remove static object's
parents 3d6a312a 012b4180

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

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ parcelable CodecParameters { 
  int bitdepth;

  int minBitrate;

  int maxBitrate;

  boolean lowLatency;

  boolean lossless;

  boolean lowLatency = false;

  boolean lossless = false;

  byte[] vendorSpecificParameters;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ interface IBluetoothAudioProvider { 
  void updateAudioConfiguration(in android.hardware.bluetooth.audio.AudioConfiguration audioConfig);

  void setLowLatencyModeAllowed(in boolean allowed);

  android.hardware.bluetooth.audio.A2dpStatus parseA2dpConfiguration(in android.hardware.bluetooth.audio.CodecId codecId, in byte[] configuration, out android.hardware.bluetooth.audio.CodecParameters codecParameters);

  @nullable android.hardware.bluetooth.audio.A2dpConfiguration getA2dpConfiguration(in List<android.hardware.bluetooth.audio.A2dpRemoteCapabilities> remoteA2dpCapabilities, in android.hardware.bluetooth.audio.A2dpConfigurationHint hint);

  @nullable android.hardware.bluetooth.audio.A2dpConfiguration getA2dpConfiguration(in android.hardware.bluetooth.audio.A2dpRemoteCapabilities[] remoteA2dpCapabilities, in android.hardware.bluetooth.audio.A2dpConfigurationHint hint);

  void setCodecPriority(in android.hardware.bluetooth.audio.CodecId codecId, int priority);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseConfigurationSetting[] getLeAudioAseConfiguration(in @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDeviceCapabilities[] remoteSinkAudioCapabilities, in @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDeviceCapabilities[] remoteSourceAudioCapabilities, in android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioConfigurationRequirement[] requirements);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseQosConfigurationPair getLeAudioAseQosConfiguration(in android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseQosConfigurationRequirement qosRequirement);

bluetooth/audio/aidl/android/hardware/bluetooth/audio/A2dpConfiguration.aidl

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.hardware.bluetooth.audio.CodecParameters; 
parcelable A2dpConfiguration {

    /**

     * Remote Stream Endpoint Identifier

     * This matches `A2dpRemoteCapabilities.seid` given by the framework.

     */

    int remoteSeid;
@@ -35,7 +36,7 @@ parcelable A2dpConfiguration { 
     * `configuration`. Using `id.a2dp`, the format is given by the `Codec

     * Specific Information Elements` [A2DP - 4.3-6.2], and using `id.vendor`,

     * by `Vendor Specific Value` [A2DP - 4.7.2].

     * In any case, this byte array is limited by the framework to 128 Bytes.

     * In any case, this byte array must be limited to 128 bytes.

     */

    CodecId id;

    CodecParameters parameters;

bluetooth/audio/aidl/android/hardware/bluetooth/audio/A2dpRemoteCapabilities.aidl

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.hardware.bluetooth.audio.CodecId; 
parcelable A2dpRemoteCapabilities {

    /**

     * Remote Stream Endpoint identifier

     * Allocated by the remote device to identify a specific codec and capabilities,

     * in the meaning of the AVDTP standard.

     */

    int seid;

bluetooth/audio/aidl/android/hardware/bluetooth/audio/A2dpStreamConfiguration.aidl

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import android.hardware.bluetooth.audio.CodecId; 
@VintfStability

parcelable A2dpStreamConfiguration {

    /**

     * Peer MTU (16 bits)

     * Peer Maximum Transfer Unit (MTU), 16 bits value [Core - 3.A.5.1]

     * It's the remote device indication of the maximum amount of data that

     * can be received on the AVDTP Stream Channel.

     */

    int peerMtu;
@@ -29,6 +31,7 @@ parcelable A2dpStreamConfiguration { 
     * Optional SCMS-T Content Protection header

     * that precedes audio content when enabled [A2DP - 3.2.1-2].

     * The content protection byte is defined by [Assigned Number - 6.3.2].

     * When the content protection is not enabled, this field should be left `null`.

     */

    @nullable byte[1] cpHeaderScmst;