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

Commit d6186e36 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "pbp-leaudio-aidl" 

* changes:
  Update android.hardware.bluetooth.audio to V3
  Add new field 'pcmStreamId' in LeAudioBroadcastConfiguration
parents 9c08ea44 dfd6fb21

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

+1 −0
Original line number Diff line number Diff line
@@ -41,5 +41,6 @@ parcelable LeAudioBroadcastConfiguration { 
    char streamHandle;

    int audioChannelAllocation;

    android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCodecConfig;

    char pcmStreamId;

  }

}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ parcelable LeAudioBroadcastConfiguration { 
         */

        int audioChannelAllocation;

        LeAudioCodecConfiguration leAudioCodecConfig;

        /*

         * Pcm stream id to identify the source for given streamHandle.

         */

        char pcmStreamId;

    }

    CodecType codecType;

    BroadcastStreamMap[] streamMap;

bluetooth/audio/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ cc_library_shared { 
        "libcutils",

        "libfmq",

        "liblog",

        "android.hardware.bluetooth.audio-V2-ndk",

        "android.hardware.bluetooth.audio-V3-ndk",

        "libbluetooth_audio_session_aidl",

    ],

}

bluetooth/audio/aidl/default/bluetooth_audio.xml

+1 −1
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

    <hal format="aidl">

        <name>android.hardware.bluetooth.audio</name>

        <version>2</version>

        <version>3</version>

        <fqname>IBluetoothAudioProviderFactory/default</fqname>

    </hal>

</manifest>

bluetooth/audio/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cc_test { 
    srcs: ["VtsHalBluetoothAudioTargetTest.cpp"],

    shared_libs: [

        "android.hardware.audio.common-V1-ndk",

        "android.hardware.bluetooth.audio-V2-ndk",

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "libbase",