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

Commit bc20fb35 authored Dec 06, 2024 by Brian Delwiche

Remove flags for encrypted AVDTP & AVCTP channel

b/345258562 has received a month of soak and is ready for flag removal.
Ordinarily we would leave this until release, but it needs to be done
early in this case because flag removal is a requirement for Dr. No on
the associated security backports.

Test: mmm packages/modules/Bluetooth
Bug: 357662929
Bug: 315241296
Change-Id: I8d4ab527ba2546042553703157e2678bb5e6b803

parent e9b7d1d0

flags/pairing.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -111,16 +111,6 @@ flag {
		}
		}

		flag {
		name: "use_encrypt_req_for_av"
		namespace: "bluetooth"
		description: "Use encrypted link for AVDTP and AVCTP channel"
		bug: "357662929"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "donot_queue_dup_rnr"
		namespace: "bluetooth"

system/stack/avct/avct_api.cc

+0 −3

Original line number	Diff line number	Diff line
		@@ -70,9 +70,6 @@ void AVCT_Register() {
		memset(&avct_cb, 0, sizeof(tAVCT_CB));

		uint16_t sec = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;
		if (!com::android::bluetooth::flags::use_encrypt_req_for_av()) {
		sec = BTA_SEC_AUTHENTICATE;
		}

		/* register PSM with L2CAP */
		if (!stack::l2cap::get_interface().L2CA_RegisterWithSecurity(

system/stack/avct/avct_bcb_act.cc

+2 −7

Original line number	Diff line number	Diff line
		@@ -130,13 +130,8 @@ void avct_bcb_chnl_open(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* /* p_data */) {

		/* call l2cap connect req */
		p_bcb->ch_state = AVCT_CH_CONN;
		if (com::android::bluetooth::flags::use_encrypt_req_for_av()) {
		p_bcb->ch_lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(
		BT_PSM_AVCTP_BROWSE, p_lcb->peer_addr, BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
		} else {
		p_bcb->ch_lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(
		BT_PSM_AVCTP_BROWSE, p_lcb->peer_addr, BTA_SEC_AUTHENTICATE);
		}
		if (p_bcb->ch_lcid == 0) {
		/* if connect req failed, send ourselves close event */
		tAVCT_LCB_EVT avct_lcb_evt;

system/stack/avct/avct_lcb_act.cc

+2 −7

Original line number	Diff line number	Diff line
		@@ -192,13 +192,8 @@ void avct_lcb_chnl_open(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* /* p_data */) {
		uint16_t result = AVCT_RESULT_FAIL;

		p_lcb->ch_state = AVCT_CH_CONN;
		if (com::android::bluetooth::flags::use_encrypt_req_for_av()) {
		p_lcb->ch_lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(
		BT_PSM_AVCTP, p_lcb->peer_addr, BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
		} else {
		p_lcb->ch_lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(
		BT_PSM_AVCTP, p_lcb->peer_addr, BTA_SEC_AUTHENTICATE);
		}
		if (p_lcb->ch_lcid == 0) {
		/* if connect req failed, send ourselves close event */
		tAVCT_LCB_EVT avct_lcb_evt;

system/stack/avdt/avdt_ad.cc

+2 −7

Original line number	Diff line number	Diff line
		@@ -530,13 +530,8 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, tAVDT_ROLE
		p_tbl->state = AVDT_AD_ST_CONN;

		/* call l2cap connect req */
		if (com::android::bluetooth::flags::use_encrypt_req_for_av()) {
		lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(
		AVDT_PSM, p_ccb->peer_addr, BTM_SEC_OUT_AUTHENTICATE \| BTM_SEC_OUT_ENCRYPT);
		} else {
		lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(AVDT_PSM, p_ccb->peer_addr,
		BTM_SEC_OUT_AUTHENTICATE);
		}

		if (lcid == 0) {
		/* if connect req failed, call avdt_ad_tc_close_ind() */