HFP: fix peer_codecs bitmask in RFCOMM and SDP workaround
The bitop doesn't seem right after reading the associated comments,
while there may be almost no effect at the moment, we change it from AND
to OR so that `peer_codecs` reflects full capability as intended.
Bug: 243732454
Test: Compilation test
Change-Id: Ib386aa5be3a4cf1cc18f04cf5095440b1106745c
diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc
index 1ba68bc..1fbf17e 100644
--- a/system/bta/ag/bta_ag_act.cc
+++ b/system/bta/ag/bta_ag_act.cc
@@ -471,7 +471,7 @@
bool sdp_wbs_support = p_scb->peer_sdp_features & BTA_AG_FEAT_WBS_SUPPORT;
if (!p_scb->received_at_bac && sdp_wbs_support) {
p_scb->codec_updated = true;
- p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTM_SCO_CODEC_MSBC;
+ p_scb->peer_codecs = BTM_SCO_CODEC_CVSD | BTM_SCO_CODEC_MSBC;
p_scb->sco_codec = UUID_CODEC_MSBC;
}
} else {
diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc
index bb39a43..01dd353 100644
--- a/system/bta/ag/bta_ag_sdp.cc
+++ b/system/bta/ag/bta_ag_sdp.cc
@@ -369,7 +369,7 @@
// 2. But do not send required AT+BAC command
// Will assume mSBC is enabled and try codec negotiation by default
p_scb->codec_updated = true;
- p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTM_SCO_CODEC_MSBC;
+ p_scb->peer_codecs = BTM_SCO_CODEC_CVSD | BTM_SCO_CODEC_MSBC;
p_scb->sco_codec = UUID_CODEC_MSBC;
}
if (sdp_features != p_scb->peer_sdp_features) {
