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

Commit 71f3a155 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Remove flags from group status" am: 2aaa3cc3 am: 9a87acde... 

Merge "leaudio: Remove flags from group status" am: 2aaa3cc3 am: 9a87acde am: af0f0804 am: 739dd793 am: 0b139bc1

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

Change-Id: I30b22726f385ba3190180576d5377443fe076d7f
parents 416b743b 0b139bc1

system/btif/src/btif_le_audio.cc

+4 −5
Original line number Original line Diff line number Diff line
@@ -47,11 +47,10 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
                                     Unretained(callbacks), state, address));

                                     Unretained(callbacks), state, address));

  }

  }





  void OnGroupStatus(uint8_t group_id, GroupStatus group_status,

  void OnGroupStatus(int group_id, GroupStatus group_status) override {

                     uint8_t group_flags) override {

    do_in_jni_thread(FROM_HERE,

    do_in_jni_thread(FROM_HERE, Bind(&LeAudioClientCallbacks::OnGroupStatus,

                     Bind(&LeAudioClientCallbacks::OnGroupStatus,

                                     Unretained(callbacks), group_id,

                          Unretained(callbacks), group_id, group_status));

                                     group_status, group_flags));

  }

  }





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

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

system/include/hardware/bt_le_audio.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -54,8 +54,7 @@ class LeAudioClientCallbacks { 
                                 const RawAddress& address) = 0;

                                 const RawAddress& address) = 0;





  /* Callback with group status update */

  /* Callback with group status update */

  virtual void OnGroupStatus(uint8_t group_id, GroupStatus group_status,

  virtual void OnGroupStatus(int group_id, GroupStatus group_status) = 0;

                             uint8_t group_flags) = 0;





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

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

  virtual void OnAudioConf(uint8_t direction, int group_id,

  virtual void OnAudioConf(uint8_t direction, int group_id,