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

Commit 529c0812 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a2dp vendor codec extension" am: 82d991db 

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

Change-Id: I968ebef8f0d872c24601bfe916b1791d9dc8ed1c
parents ca55bc6b 82d991db

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -37,11 +37,16 @@ parcelable CodecCapabilities { 
  android.hardware.bluetooth.audio.CodecType codecType;

  android.hardware.bluetooth.audio.CodecType codecType;

  android.hardware.bluetooth.audio.CodecCapabilities.Capabilities capabilities;

  android.hardware.bluetooth.audio.CodecCapabilities.Capabilities capabilities;

  @VintfStability

  @VintfStability

  parcelable VendorCapabilities {

    ParcelableHolder extension;

  }

  @VintfStability

  union Capabilities {

  union Capabilities {

    android.hardware.bluetooth.audio.SbcCapabilities sbcCapabilities;

    android.hardware.bluetooth.audio.SbcCapabilities sbcCapabilities;

    android.hardware.bluetooth.audio.AacCapabilities aacCapabilities;

    android.hardware.bluetooth.audio.AacCapabilities aacCapabilities;

    android.hardware.bluetooth.audio.LdacCapabilities ldacCapabilities;

    android.hardware.bluetooth.audio.LdacCapabilities ldacCapabilities;

    android.hardware.bluetooth.audio.AptxCapabilities aptxCapabilities;

    android.hardware.bluetooth.audio.AptxCapabilities aptxCapabilities;

    android.hardware.bluetooth.audio.Lc3Capabilities lc3Capabilities;

    android.hardware.bluetooth.audio.Lc3Capabilities lc3Capabilities;

    android.hardware.bluetooth.audio.CodecCapabilities.VendorCapabilities vendorCapabilities;

  }

  }

}
 
}

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -40,11 +40,18 @@ parcelable CodecConfiguration { 
  boolean isScmstEnabled;

  boolean isScmstEnabled;

  android.hardware.bluetooth.audio.CodecConfiguration.CodecSpecific config;

  android.hardware.bluetooth.audio.CodecConfiguration.CodecSpecific config;

  @VintfStability

  @VintfStability

  parcelable VendorConfiguration {

    int vendorId;

    char codecId;

    ParcelableHolder codecConfig;

  }

  @VintfStability

  union CodecSpecific {

  union CodecSpecific {

    android.hardware.bluetooth.audio.SbcConfiguration sbcConfig;

    android.hardware.bluetooth.audio.SbcConfiguration sbcConfig;

    android.hardware.bluetooth.audio.AacConfiguration aacConfig;

    android.hardware.bluetooth.audio.AacConfiguration aacConfig;

    android.hardware.bluetooth.audio.LdacConfiguration ldacConfig;

    android.hardware.bluetooth.audio.LdacConfiguration ldacConfig;

    android.hardware.bluetooth.audio.AptxConfiguration aptxConfig;

    android.hardware.bluetooth.audio.AptxConfiguration aptxConfig;

    android.hardware.bluetooth.audio.Lc3Configuration lc3Config;

    android.hardware.bluetooth.audio.Lc3Configuration lc3Config;

    android.hardware.bluetooth.audio.CodecConfiguration.VendorConfiguration vendorConfig;

  }

  }

}
 
}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecCapabilities.aidl

+5 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,10 @@ import android.hardware.bluetooth.audio.SbcCapabilities; 
 */

 */

@VintfStability

@VintfStability

parcelable CodecCapabilities {

parcelable CodecCapabilities {

    @VintfStability

    parcelable VendorCapabilities {

        ParcelableHolder extension;

    }

    @VintfStability

    @VintfStability

    union Capabilities {

    union Capabilities {

        SbcCapabilities sbcCapabilities;

        SbcCapabilities sbcCapabilities;
@@ -36,6 +40,7 @@ parcelable CodecCapabilities { 
        LdacCapabilities ldacCapabilities;

        LdacCapabilities ldacCapabilities;

        AptxCapabilities aptxCapabilities;

        AptxCapabilities aptxCapabilities;

        Lc3Capabilities lc3Capabilities;

        Lc3Capabilities lc3Capabilities;

        VendorCapabilities vendorCapabilities;

    }

    }

    CodecType codecType;

    CodecType codecType;

    Capabilities capabilities;

    Capabilities capabilities;

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecConfiguration.aidl

+7 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,12 @@ import android.hardware.bluetooth.audio.SbcConfiguration; 
 */

 */

@VintfStability

@VintfStability

parcelable CodecConfiguration {

parcelable CodecConfiguration {

    @VintfStability

    parcelable VendorConfiguration {

        int vendorId;

        char codecId;

        ParcelableHolder codecConfig;

    }

    @VintfStability

    @VintfStability

    union CodecSpecific {

    union CodecSpecific {

        SbcConfiguration sbcConfig;

        SbcConfiguration sbcConfig;
@@ -36,6 +42,7 @@ parcelable CodecConfiguration { 
        LdacConfiguration ldacConfig;

        LdacConfiguration ldacConfig;

        AptxConfiguration aptxConfig;

        AptxConfiguration aptxConfig;

        Lc3Configuration lc3Config;

        Lc3Configuration lc3Config;

        VendorConfiguration vendorConfig;

    }

    }

    CodecType codecType;

    CodecType codecType;

    /**

    /**

bluetooth/audio/utils/aidl_session/BluetoothAudioCodecs.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -356,7 +356,6 @@ BluetoothAudioCodecs::GetA2dpOffloadCodecCapabilities( 
        break;

        break;

      case CodecType::UNKNOWN:

      case CodecType::UNKNOWN:

      case CodecType::VENDOR:

      case CodecType::VENDOR:

        codec_capability = {};

        break;

        break;

    }

    }

  }

  }