Merge "Add capability to callback on client or server for connection"
diff --git a/btif/src/btif_rc.cc b/btif/src/btif_rc.cc
index 3db2ee9..d8ea94c 100644
--- a/btif/src/btif_rc.cc
+++ b/btif/src/btif_rc.cc
@@ -3152,11 +3152,10 @@
break;
} else {
uint8_t* p_data = p_rsp->param.track;
- /* Update the UID for current track
- * Attributes will be fetched after the AVRCP procedure
- */
BE_STREAM_TO_UINT64(p_dev->rc_playing_uid, p_data);
get_play_status_cmd(p_dev);
+ get_element_attribute_cmd(AVRC_MAX_NUM_MEDIA_ATTR_ID, attr_list,
+ p_dev);
}
break;
diff --git a/vendor_libs/test_vendor_lib/model/devices/beacon.cc b/vendor_libs/test_vendor_lib/model/devices/beacon.cc
index 492ddcc..77491d9 100644
--- a/vendor_libs/test_vendor_lib/model/devices/beacon.cc
+++ b/vendor_libs/test_vendor_lib/model/devices/beacon.cc
@@ -80,7 +80,7 @@
void Beacon::IncomingPacket(model::packets::LinkLayerPacketView packet) {
if (packet.GetDestinationAddress() == properties_.GetLeAddress() &&
packet.GetType() == model::packets::PacketType::LE_SCAN) {
- auto scan_response = model::packets::LeAdvertisementBuilder::Create(
+ auto scan_response = model::packets::LeScanResponseBuilder::Create(
properties_.GetLeAddress(), packet.GetSourceAddress(),
model::packets::AddressType::PUBLIC,
model::packets::AdvertisementType::SCAN_RESPONSE,
diff --git a/vendor_libs/test_vendor_lib/model/devices/loopback.cc b/vendor_libs/test_vendor_lib/model/devices/loopback.cc
index e0b9f35..dd8d3ed 100644
--- a/vendor_libs/test_vendor_lib/model/devices/loopback.cc
+++ b/vendor_libs/test_vendor_lib/model/devices/loopback.cc
@@ -72,7 +72,7 @@
packet.GetType() == model::packets::PacketType::LE_SCAN) {
LOG_INFO("Got a scan");
- auto scan_response = model::packets::LeAdvertisementBuilder::Create(
+ auto scan_response = model::packets::LeScanResponseBuilder::Create(
properties_.GetLeAddress(), packet.GetSourceAddress(),
model::packets::AddressType::PUBLIC,
model::packets::AdvertisementType::SCAN_RESPONSE,