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

Commit f5a50194 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "le_audio: Adopt group configuration change callback to jni" into... 

Merge "le_audio: Adopt group configuration change callback to jni" into stage-aosp-master am: 62813d17 am: 8c9a3e7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15736703

Change-Id: I9337b6a9ced507cf3f7ee2d6d9e4b23f97566df7
parents 1b9012d5 8c9a3e7e

system/btif/src/btif_le_audio.cc

+6 −7
Original line number Diff line number Diff line
@@ -61,13 +61,12 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
                          Unretained(callbacks), address, group_id));

  }



  void OnAudioConf(const RawAddress& addr, uint8_t direction, uint8_t group_id,

                   uint32_t snk_audio_location,

                   uint32_t src_audio_location) override {

    do_in_jni_thread(

        FROM_HERE,

        Bind(&LeAudioClientCallbacks::OnAudioConf, Unretained(callbacks), addr,

             direction, group_id, snk_audio_location, src_audio_location));

  void OnAudioConf(uint8_t direction, int group_id, uint32_t snk_audio_location,

                   uint32_t src_audio_location, uint16_t avail_cont) override {

    do_in_jni_thread(FROM_HERE,

                     Bind(&LeAudioClientCallbacks::OnAudioConf,

                          Unretained(callbacks), direction, group_id,

                          snk_audio_location, src_audio_location, avail_cont));

  }



  void Initialize(LeAudioClientCallbacks* callbacks) override {

system/include/hardware/bt_le_audio.h

+5 −4
Original line number Diff line number Diff line
@@ -52,10 +52,11 @@ class LeAudioClientCallbacks { 
  virtual void OnGroupStatus(uint8_t group_id, GroupStatus group_status,

                             uint8_t group_flags) = 0;



  /* Callback for newly recognized or reconfigured existing le audio device */

  virtual void OnAudioConf(const RawAddress& addr, uint8_t direction,

                           uint8_t group_id, uint32_t snk_audio_location,

                           uint32_t src_audio_location) = 0;

  /* Callback for newly recognized or reconfigured existing le audio group */

  virtual void OnAudioConf(uint8_t direction, int group_id,

                           uint32_t snk_audio_location,

                           uint32_t src_audio_location,

                           uint16_t avail_cont) = 0;



  /* Callback for available set member  */

  virtual void OnSetMemberAvailable(const RawAddress& address,