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

Commit a2db88f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am: bf75ec2a 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2074374898d9695c550034ff48be0a4b8aaa0383
parents 33600006 bf75ec2a

system/profile/avrcp/connection_handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ void ConnectionHandler::MessageCb(uint8_t handle, uint8_t label, uint8_t opcode, 
  device_map_[handle]->MessageReceived(label, Packet::Parse(pkt));

}



void ConnectionHandler::SdpCb(const RawAddress& bdaddr, SdpCallback cb,

void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb,

                              tSDP_DISCOVERY_DB* disc_db, uint16_t status) {

  LOG(INFO) << __PRETTY_FUNCTION__ << ": SDP lookup callback received";

system/profile/avrcp/connection_handler.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ class ConnectionHandler { 
  using SdpCallback = base::Callback<void(uint16_t status, uint16_t version,

                                          uint16_t features)>;

  virtual bool SdpLookup(const RawAddress& bdaddr, SdpCallback cb);

  void SdpCb(const RawAddress& bdaddr, SdpCallback cb,

  void SdpCb(RawAddress bdaddr, SdpCallback cb,

             tSDP_DISCOVERY_DB* disc_db, uint16_t status);



  virtual bool AvrcpConnect(bool initiator, const RawAddress& bdaddr);