diff options
| -rw-r--r-- | flags/security.aconfig | 10 | ||||
| -rw-r--r-- | system/bta/av/bta_av_aact.cc | 24 |
2 files changed, 7 insertions, 27 deletions
diff --git a/flags/security.aconfig b/flags/security.aconfig index 564eb02813..cb7cdac795 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -26,16 +26,6 @@ flag { } flag { - name: "bta_av_setconfig_rej_type_confusion" - namespace: "bluetooth" - description: "Use stream control block for bta_av_setconfig_rej instead of a possibly incorrect union type" - bug: "341754333" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "btsec_check_valid_discovery_database" namespace: "bluetooth" description: "Check for a valid discovery database before using it, and don't set up a discovery database for a new HF client if one has already been defined for it" diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc index 769cefc4d9..3db0d468a6 100644 --- a/system/bta/av/bta_av_aact.cc +++ b/system/bta/av/bta_av_aact.cc @@ -1765,23 +1765,13 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { tBTA_AV bta_av_data; - if (com::android::bluetooth::flags::bta_av_setconfig_rej_type_confusion()) { - bta_av_data = { - .reject = - { - .bd_addr = p_scb->PeerAddress(), - .hndl = p_scb->hndl, - }, - }; - } else { - bta_av_data = { - .reject = - { - .bd_addr = p_data->str_msg.bd_addr, - .hndl = p_scb->hndl, - }, - }; - } + bta_av_data = { + .reject = + { + .bd_addr = p_scb->PeerAddress(), + .hndl = p_scb->hndl, + }, + }; (*bta_av_cb.p_cback)(BTA_AV_REJECT_EVT, &bta_av_data); } |