Merge changes Ifbac5c91,Idd4fcbb0,I759cf570 into main (ed9901cc) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_sco.cc

+0 −16

Original line number	Diff line number	Diff line
		@@ -434,12 +434,10 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {
		return;
		}

		#if (DISABLE_WBS == FALSE)
		if ((p_scb->sco_codec == BTM_SCO_CODEC_MSBC) && !p_scb->codec_fallback &&
		hfp_hal_interface::get_wbs_supported()) {
		esco_codec = UUID_CODEC_MSBC;
		}
		#endif

		if (is_hfp_aptx_voice_enabled()) {
		if ((p_scb->sco_codec == BTA_AG_SCO_APTX_SWB_SETTINGS_Q0) &&
		@@ -818,14 +816,9 @@ static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) {
		/* remove listening connection */
		bta_ag_remove_sco(p_scb, false);

		#if (DISABLE_WBS == FALSE)
		/* start codec negotiation */
		p_sco->state = BTA_AG_SCO_CODEC_ST;
		bta_ag_codec_negotiate(p_scb);
		#else
		bta_ag_create_sco(p_scb, true);
		p_sco->state = BTA_AG_SCO_OPENING_ST;
		#endif
		break;

		case BTA_AG_SCO_SHUTDOWN_E:
		@@ -928,13 +921,11 @@ static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) {
		}
		break;

		#if (DISABLE_WBS == FALSE)
		case BTA_AG_SCO_REOPEN_E:
		/* start codec negotiation */
		p_sco->state = BTA_AG_SCO_CODEC_ST;
		bta_ag_codec_negotiate(p_scb);
		break;
		#endif

		case BTA_AG_SCO_XFER_E:
		/* save xfer scb */
		@@ -1206,18 +1197,11 @@ static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) {
		bta_ag_create_sco(p_scb, false);
		bta_ag_remove_sco(p_sco->p_xfer_scb, false);

		#if (DISABLE_WBS == FALSE)
		/* start codec negotiation */
		p_sco->state = BTA_AG_SCO_CODEC_ST;
		tBTA_AG_SCB* p_cn_scb = p_sco->p_xfer_scb;
		p_sco->p_xfer_scb = nullptr;
		bta_ag_codec_negotiate(p_cn_scb);
		#else
		/* create sco connection to peer */
		bta_ag_create_sco(p_sco->p_xfer_scb, true);
		p_sco->p_xfer_scb = nullptr;
		p_sco->state = BTA_AG_SCO_OPENING_ST;
		#endif
		break;
		}

system/internal_include/bt_target.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -192,15 +192,6 @@
		*
		*****************************************************************************/

		/* Cancel Inquiry on incoming SSP */
		#ifndef BTM_NO_SSP_ON_INQUIRY
		#define BTM_NO_SSP_ON_INQUIRY FALSE
		#endif

		#ifndef DISABLE_WBS
		#define DISABLE_WBS FALSE
		#endif

		/**************************
		* Initial SCO TX credit
		************************/

system/stack/btm/btm_inq.cc

+0 −38

Original line number	Diff line number	Diff line
		@@ -1084,7 +1084,6 @@ void btm_inq_db_init(void) {
		alarm_free(btm_cb.btm_inq_vars.remote_name_timer);
		btm_cb.btm_inq_vars.remote_name_timer =
		alarm_new("btm_inq.remote_name_timer");
		btm_cb.btm_inq_vars.no_inc_ssp = BTM_NO_SSP_ON_INQUIRY;
		btm_inq_db_set_inq_by_rssi();
		}

		@@ -1096,43 +1095,6 @@ void btm_inq_db_set_inq_by_rssi(void) {
		internal_.inq_by_rssi = osi_property_get_bool(PROPERTY_INQ_BY_RSSI, false);
		}

		/*******************************************************************************
		*
		* Function btm_inq_stop_on_ssp
		*
		* Description This function is called on incoming SSP
		*
		* Returns void
		*
		******************************************************************************/
		void btm_inq_stop_on_ssp(void) {
		uint8_t normal_active = (BTM_GENERAL_INQUIRY_ACTIVE);

		#if (BTM_INQ_DEBUG == TRUE)
		log::verbose("btm_inq_stop_on_ssp: no_inc_ssp={} inq_active:0x{:x} state:{} ",
		btm_cb.btm_inq_vars.no_inc_ssp, btm_cb.btm_inq_vars.inq_active,
		btm_cb.btm_inq_vars.state);
		#endif
		if (btm_cb.btm_inq_vars.no_inc_ssp) {
		if (btm_cb.btm_inq_vars.state == BTM_INQ_ACTIVE_STATE) {
		if (btm_cb.btm_inq_vars.inq_active & normal_active) {
		/* can not call BTM_CancelInquiry() here. We need to report inquiry
		* complete evt */
		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);
		}));
		}
		}
		/* do not allow inquiry to start */
		btm_cb.btm_inq_vars.inq_active \|= BTM_SSP_INQUIRY_ACTIVE;
		}
		}

		/*******************************************************************************
		*
		* Function btm_inq_clear_ssp

system/stack/btm/btm_sco_hfp_hal.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ bool is_coding_format_supported(esco_coding_format_t coding_format) {
		}

		// Android statically compiles WBS support.
		bool get_wbs_supported() { return !DISABLE_WBS; }
		bool get_wbs_supported() { return true; }

		bool get_swb_supported() {
		return osi_property_get_bool("bluetooth.hfp.swb.supported", false) &&

system/stack/btm/btm_sec.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -93,7 +93,6 @@ extern tBTM_CB btm_cb;
		(BTM_SEC_LE_AUTHENTICATED \| BTM_SEC_LE_ENCRYPTED \| \
		BTM_SEC_LE_LINK_KEY_KNOWN \| BTM_SEC_LE_LINK_KEY_AUTHED)

		void btm_inq_stop_on_ssp(void);
		bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,
		const RawAddress& new_pseudo_addr);
		void bta_dm_remove_device(const RawAddress& bd_addr);
		@@ -2646,9 +2645,6 @@ void btm_io_capabilities_rsp(const tBTM_SP_IO_RSP evt_data) {
		btm_sec_cb.pairing_bda = evt_data.bd_addr;

		btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_INCOMING_SSP);

		/* work around for FW bug */
		btm_inq_stop_on_ssp();
		}

		/* Notify L2CAP to increase timeout */