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

Commit 62bf1de6 authored by Chienyuan's avatar Chienyuan Committed by Automerger Merge Worker
Browse files

AVRCP: pass bdaddr by value when use SdpCb am: 2935a34a 

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

Change-Id: I243ee6b18962d6ebedab62a2499ed7f1940cb98b
parents 9ac02e7d 2935a34a

system/profile/avrcp/connection_handler.cc

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

  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, bool retry,

                              tSDP_DISCOVERY_DB* disc_db, bool retry,

                              uint16_t status) {

                              uint16_t status) {

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

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

system/profile/avrcp/connection_handler.h

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

  using SdpCallback = base::Callback<void(uint16_t status, uint16_t version,

                                          uint16_t features)>;

                                          uint16_t features)>;

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

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

  void SdpCb(const RawAddress& bdaddr, SdpCallback cb,

  void SdpCb(RawAddress bdaddr, SdpCallback cb,

             tSDP_DISCOVERY_DB* disc_db, bool retry, uint16_t status);

             tSDP_DISCOVERY_DB* disc_db, bool retry, uint16_t status);





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

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