summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEn-Shuo Hsu <enshuo@google.com>2022-03-07 19:53:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-07 19:53:28 +0000
commita3ca33c86d88ea73698d027fd38e1e1a99ad24ac (patch)
treeb87a447855fd98d8468086813890d9e0734ec6ca
parented0299f84c63e089716501636eaaa169415e9e6c (diff)
parent0fc9e85f4f7585bdb0570d961442e87d1a45ec9f (diff)
Merge "floss: Align the read and write rate" am: 33267bd87b am: 063388381b am: 0fc9e85f4f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2008894 Change-Id: Iabfff0ff399dd984085befffb93f19be147d5213
-rw-r--r--system/stack/btm/btm_sco.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/system/stack/btm/btm_sco.cc b/system/stack/btm/btm_sco.cc
index c1d96dec86..a48bdfdaea 100644
--- a/system/stack/btm/btm_sco.cc
+++ b/system/stack/btm/btm_sco.cc
@@ -199,7 +199,6 @@ void btm_route_sco_data(BT_HDR* p_msg) {
osi_free(p_msg);
return;
}
- LOG_INFO("Received SCO packet from HCI. Dropping it since no handler so far");
uint16_t handle = handle_with_flags & 0xFFF;
ASSERT_LOG(handle <= 0xEFF, "Require handle <= 0xEFF, but is 0x%X", handle);
auto* active_sco = btm_get_active_sco();
@@ -210,7 +209,7 @@ void btm_route_sco_data(BT_HDR* p_msg) {
osi_free(p_msg);
// For Chrome OS, we send the outgoing data after receiving an incoming one
uint8_t out_buf[BTM_SCO_DATA_SIZE_MAX];
- auto size_read = bluetooth::audio::sco::read(out_buf, BTM_SCO_DATA_SIZE_MAX);
+ auto size_read = bluetooth::audio::sco::read(out_buf, length);
auto data = std::vector<uint8_t>(out_buf, out_buf + size_read);
// TODO: For MSBC, we need to encode here
btm_send_sco_packet(std::move(data));