Snap for 11976889 from 81575447fdbd34ed3bb822f5d3d7f54cc7bd1efb to 24Q3-release (155543c2) · Commits · e / os / android_packages_modules_Bluetooth

flags/l2cap.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,13 @@ flag {
		description: "Rewrite logic of p_ccb check in l2c_link_sec_comp"
		bug: "326686472"
		}

		flag {
		name: "l2cap_le_do_not_adjust_min_interval"
		namespace: "bluetooth"
		description: "Do not adjust min_interval in connection update request"
		bug: "346960036"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

flags/rnr.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -24,3 +24,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "rnr_validate_page_scan_repetition_mode"
		namespace: "bluetooth"
		description: "Validate page scan repetition mode parameter before sending RNR"
		bug: "344520866"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

system/stack/btm/btm_ble_gap.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -2491,7 +2491,7 @@ void btm_ble_stop_inquiry(void) {
		// TODO: remove this call and make btm_process_inq_complete static
		btm_process_inq_complete(
		HCI_SUCCESS,
		(uint8_t)(btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_INQUIRY_MASK));
		(uint8_t)(btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_GENERAL_INQUIRY));
		}

		/*******************************************************************************

system/stack/btm/btm_inq.cc

+19 −9

Original line number	Diff line number	Diff line
		@@ -527,7 +527,7 @@ uint16_t BTM_IsInquiryActive(void) {
		static void BTM_CancelLeScan() {
		if (!bluetooth::shim::is_classic_discovery_only_enabled()) {
		log::assert_that(BTM_IsDeviceUp(), "assert failed: BTM_IsDeviceUp()");
		if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0)
		if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_GENERAL_INQUIRY) != 0)
		btm_ble_stop_inquiry();
		} else {
		log::info(
		@@ -585,14 +585,14 @@ void BTM_CancelInquiry(void) {
		NULL; /* Do not notify caller anymore */
		btm_cb.btm_inq_vars.p_inq_cmpl_cb = NULL; /* Do not notify caller anymore */

		if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BR_INQUIRY_MASK) != 0) {
		if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_GENERAL_INQUIRY) != 0) {
		bluetooth::shim::GetHciLayer()->EnqueueCommand(
		bluetooth::hci::InquiryCancelBuilder::Create(),
		get_main_thread()->BindOnce(
		[](bluetooth::hci::CommandCompleteView complete_view) {
		bluetooth::hci::check_complete<
		bluetooth::hci::InquiryCancelCompleteView>(complete_view);
		btm_process_cancel_complete(HCI_SUCCESS, BTM_BR_INQUIRY_MASK);
		btm_process_cancel_complete(HCI_SUCCESS, BTM_GENERAL_INQUIRY);
		}));
		}
		BTM_CancelLeScan();
		@@ -607,7 +607,7 @@ static void btm_classic_inquiry_timeout(void* /* data */) {
		// will be marked as completed. Therefore, we only need to mark
		// the BLE inquiry as completed here to stop processing BLE results
		// as inquiry results.
		btm_process_inq_complete(HCI_SUCCESS, BTM_BLE_INQUIRY_MASK);
		btm_process_inq_complete(HCI_SUCCESS, BTM_BLE_GENERAL_INQUIRY);
		}

		/*******************************************************************************
		@@ -630,7 +630,7 @@ static tBTM_STATUS BTM_StartLeScan() {
		return BTM_CMD_STARTED;
		} else {
		log::warn("Trying to do LE scan on a non-LE adapter");
		btm_cb.btm_inq_vars.inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;
		btm_cb.btm_inq_vars.inqparms.mode &= ~BTM_BLE_GENERAL_INQUIRY;
		}
		} else {
		log::info(
		@@ -1891,9 +1891,19 @@ tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda,
		clock_offset = clock_offset_in_cfg;
		}
		}
		bluetooth::shim::ACL_RemoteNameRequest(
		remote_bda, p_cur->results.page_scan_rep_mode,
		p_cur->results.page_scan_mode, clock_offset);
		uint8_t page_scan_rep_mode = p_cur->results.page_scan_rep_mode;
		if (com::android::bluetooth::flags::
		rnr_validate_page_scan_repetition_mode() &&
		page_scan_rep_mode >= HCI_PAGE_SCAN_REP_MODE_RESERVED_START) {
		log::info(
		"Invalid page scan repetition mode {} from remote_bda:{}, "
		"fallback to R1",
		page_scan_rep_mode, remote_bda);
		page_scan_rep_mode = HCI_PAGE_SCAN_REP_MODE_R1;
		}
		bluetooth::shim::ACL_RemoteNameRequest(remote_bda, page_scan_rep_mode,
		p_cur->results.page_scan_mode,
		clock_offset);
		} else {
		uint16_t clock_offset = 0;
		int clock_offset_in_cfg = 0;
		@@ -2422,7 +2432,7 @@ static void on_inquiry_complete(bluetooth::hci::EventView event) {
		log::assert_that(complete.IsValid(), "assert failed: complete.IsValid()");
		auto status = to_hci_status_code(static_cast<uint8_t>(complete.GetStatus()));

		btm_process_inq_complete(status, BTM_BR_INQUIRY_MASK);
		btm_process_inq_complete(status, BTM_GENERAL_INQUIRY);
		}
		/*******************************************************************************
		*

system/stack/btm/neighbor_inquiry.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -67,8 +67,6 @@ enum : uint8_t {
		BTM_GENERAL_INQUIRY = 0x01,
		/* high nibble of inquiry mode for BLE inquiry mode */
		BTM_BLE_GENERAL_INQUIRY = 0x10,
		BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),
		BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),
		/* inquiry activity mask */
		BTM_INQUIRY_ACTIVE_MASK = (BTM_GENERAL_INQUIRY \| BTM_BLE_GENERAL_INQUIRY),
		};