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

Commit 7686d2b7 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "Floss: remove workaround that skips MSBC for Flex" into main am: 780e89f6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2967104



Change-Id: Ieb711a9346a1a6616392b748de54fbf3aeac8d7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7da85d3 780e89f6

system/stack/btm/btm_sco_hfp_hal_linux.cc

+0 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ void cache_codec_capabilities(struct mgmt_rp_get_codec_capabilities* rp) { 
        c.pkt_size = rp->wbs_pkt_len;

        break;

      case kCodecMsbc:

        if (!rp->transparent_wbs_supported) {

          // TODO(b/321180937): Remove this after the audio server could query

          // the offload capability from Floss and enable it properly.

          // This is a workaround for HFP to work on some CrOS Flex devices.

          continue;

        }

        offload_supported = true;

        c.inner.codec = codec::MSBC;

        c.inner.data_path = rp->hci_data_path_id;