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

Commit cc9ffa87 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski Committed by Automerger Merge Worker
Browse files

Merge "LeAudio: Fix AIDL API review issues" into main am: 17300d69 am: f248283f 

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



Change-Id: I059b6653c897ab235ea11f895de92c31675020de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb33be97 f248283f

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

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ union CodecSpecificCapabilitiesLtv { 
    const int EIGHT = 0x80;

  }

  parcelable SupportedOctetsPerCodecFrame {

    int minimum;

    int maximum;

    int min;

    int max;

  }

  parcelable SupportedMaxCodecFramesPerSDU {

    int value;

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

+4 −4
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ parcelable ConfigurationFlags { 
  const int NONE = 0x0000;

  const int LOSSLESS = 0x0001;

  const int LOW_LATENCY = 0x0002;

  const int ALLOW_ASYMMETRIC_CONFIGURATIONS = 0x0003;

  const int SPATIAL_AUDIO = 0x0004;

  const int PROVIDE_ASE_METADATA = 0x0005;

  const int MONO_MIC_CONFIGURATION = 0x0006;

  const int ALLOW_ASYMMETRIC_CONFIGURATIONS = 0x0004;

  const int SPATIAL_AUDIO = 0x0008;

  const int PROVIDE_ASE_METADATA = 0x0010;

  const int MONO_MIC_CONFIGURATION = 0x0020;

}

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

+15 −13
Original line number Diff line number Diff line
@@ -43,13 +43,15 @@ interface IBluetoothAudioProvider { 
  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);

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

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

  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);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDataPathConfigurationPair getLeAudioAseDatapathConfiguration(in @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.StreamConfig sinkConfig, in @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.StreamConfig sourceConfig);

  void onSinkAseMetadataChanged(in android.hardware.bluetooth.audio.IBluetoothAudioProvider.AseState state, int cigId, int cisId, in @nullable android.hardware.bluetooth.audio.MetadataLtv[] metadata);

  void onSourceAseMetadataChanged(in android.hardware.bluetooth.audio.IBluetoothAudioProvider.AseState state, int cigId, int cisId, in @nullable android.hardware.bluetooth.audio.MetadataLtv[] metadata);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastConfigurationSetting getLeAudioBroadcastConfiguration(in @nullable List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDeviceCapabilities> remoteSinkAudioCapabilities, in android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastConfigurationRequirement requirement);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDataPathConfiguration getLeAudioBroadcastDatapathConfiguration(in android.hardware.bluetooth.audio.AudioContext context, in android.hardware.bluetooth.audio.LeAudioBroadcastConfiguration.BroadcastStreamMap[] streamMap);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastConfigurationSetting getLeAudioBroadcastConfiguration(in @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDeviceCapabilities[] remoteSinkAudioCapabilities, in android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastConfigurationRequirement requirement);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDataPathConfiguration getLeAudioBroadcastDatapathConfiguration(in android.hardware.bluetooth.audio.AudioContext audioContext, in android.hardware.bluetooth.audio.LeAudioBroadcastConfiguration.BroadcastStreamMap[] streamMap);

  const int CODEC_PRIORITY_DISABLED = (-1) /* -1 */;

  const int CODEC_PRIORITY_NONE = 0;

  @VintfStability

  parcelable LeAudioDeviceCapabilities {

    android.hardware.bluetooth.audio.CodecId codecId;
@@ -97,8 +99,8 @@ interface IBluetoothAudioProvider { 
  parcelable LeAudioAseConfigurationSetting {

    android.hardware.bluetooth.audio.AudioContext audioContext;

    android.hardware.bluetooth.audio.IBluetoothAudioProvider.Packing packing;

    @nullable List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseConfigurationSetting.AseDirectionConfiguration> sinkAseConfiguration;

    @nullable List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseConfigurationSetting.AseDirectionConfiguration> sourceAseConfiguration;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseConfigurationSetting.AseDirectionConfiguration[] sinkAseConfiguration;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseConfigurationSetting.AseDirectionConfiguration[] sourceAseConfiguration;

    @nullable android.hardware.bluetooth.audio.ConfigurationFlags flags;

    @VintfStability

    parcelable AseDirectionConfiguration {
@@ -110,8 +112,8 @@ interface IBluetoothAudioProvider { 
  @VintfStability

  parcelable LeAudioConfigurationRequirement {

    android.hardware.bluetooth.audio.AudioContext audioContext;

    @nullable List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioConfigurationRequirement.AseDirectionRequirement> sinkAseRequirement;

    @nullable List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioConfigurationRequirement.AseDirectionRequirement> sourceAseRequirement;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioConfigurationRequirement.AseDirectionRequirement[] sinkAseRequirement;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioConfigurationRequirement.AseDirectionRequirement[] sourceAseRequirement;

    @nullable android.hardware.bluetooth.audio.ConfigurationFlags flags;

    @VintfStability

    parcelable AseDirectionRequirement {
@@ -120,7 +122,7 @@ interface IBluetoothAudioProvider { 
  }

  @VintfStability

  parcelable LeAudioAseQosConfigurationRequirement {

    android.hardware.bluetooth.audio.AudioContext contextType;

    android.hardware.bluetooth.audio.AudioContext audioContext;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseQosConfigurationRequirement.AseQosDirectionRequirement sinkAseQosRequirement;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioAseQosConfigurationRequirement.AseQosDirectionRequirement sourceAseQosRequirement;

    @nullable android.hardware.bluetooth.audio.ConfigurationFlags flags;
@@ -147,7 +149,7 @@ interface IBluetoothAudioProvider { 
    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDataPathConfiguration outputConfig;

  }

  parcelable StreamConfig {

    android.hardware.bluetooth.audio.AudioContext context;

    android.hardware.bluetooth.audio.AudioContext audioContext;

    android.hardware.bluetooth.audio.LeAudioConfiguration.StreamMap[] streamMap;

  }

  @Backing(type="byte") @VintfStability
@@ -163,13 +165,13 @@ interface IBluetoothAudioProvider { 
  }

  @VintfStability

  parcelable LeAudioBroadcastSubgroupConfigurationRequirement {

    android.hardware.bluetooth.audio.AudioContext context;

    android.hardware.bluetooth.audio.AudioContext audioContext;

    android.hardware.bluetooth.audio.IBluetoothAudioProvider.BroadcastQuality quality;

    int bisNumPerSubgroup;

  }

  @VintfStability

  parcelable LeAudioBroadcastConfigurationRequirement {

    List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastSubgroupConfigurationRequirement> subgroupConfigurationRequirements;

    android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastSubgroupConfigurationRequirement[] subgroupConfigurationRequirements;

  }

  @VintfStability

  parcelable LeAudioSubgroupBisConfiguration {
@@ -178,7 +180,7 @@ interface IBluetoothAudioProvider { 
  }

  @VintfStability

  parcelable LeAudioBroadcastSubgroupConfiguration {

    List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioSubgroupBisConfiguration> bisConfigurations;

    android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioSubgroupBisConfiguration[] bisConfigurations;

    @nullable byte[] vendorCodecConfiguration;

  }

  @VintfStability
@@ -192,6 +194,6 @@ interface IBluetoothAudioProvider { 
    android.hardware.bluetooth.audio.IBluetoothAudioProvider.Packing packing;

    android.hardware.bluetooth.audio.IBluetoothAudioProvider.Framing framing;

    @nullable android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioDataPathConfiguration dataPathConfiguration;

    List<android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastSubgroupConfiguration> subgroupsConfigurations;

    android.hardware.bluetooth.audio.IBluetoothAudioProvider.LeAudioBroadcastSubgroupConfiguration[] subgroupsConfigurations;

  }

}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecId.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ union CodecId { 


    /**

     * Vendor Codec:

     * id       16 bits - Assigned by BT Sig

     * id       16 bits - Vendor identifier, assigned by BT Sig [Assigned Numbers - 7.1]

     * codecId  16 bits - Assigned by the vendor

     */

    parcelable Vendor {

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecInfo.aidl

+9 −5
Original line number Diff line number Diff line
@@ -26,9 +26,12 @@ import android.hardware.bluetooth.audio.ConfigurationFlags; 
@VintfStability

parcelable CodecInfo {

    /**

     * Codec identifier and human readable name

     * Codec identifier

     */

    CodecId id;

    /**

     * Human readable name used to present codec to the user and for debug logs

     */

    String name;



    /**
@@ -92,17 +95,18 @@ parcelable CodecInfo { 
     */

    parcelable LeAudio {

        /**

         * Channel configuration: Mono, Dual-Mono or Stereo

         * List of independently supported channel modes: Mono, Dual-Mono, or

         * Stereo.

         */

        ChannelMode[] channelMode;



        /**

         * Supported sampling frequencies, in Hz.

         * List of supported sampling frequencies, in Hz.

         */

        int[] samplingFrequencyHz;



        /*

         * FrameDuration in microseconds.

        /**

         * List of supported FrameDurations in microseconds.

         */

        int[] frameDurationUs;