Unify the empty and any address usage (4d1e8210) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		/* reinitialize stuff */

		/* clear the remote BD address */
		p_scb->peer_addr = bd_addr_null;
		p_scb->peer_addr = bd_addr_empty;

		/* call open cback w. failure */
		bta_ag_cback_open(p_scb, NULL, BTA_AG_FAIL_SDP);
		@@ -347,7 +347,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		p_scb->svc_conn = false;
		p_scb->hsp_version = HSP_VERSION_1_2;
		/Clear the BD address/
		p_scb->peer_addr = bd_addr_null;
		p_scb->peer_addr = bd_addr_empty;

		/* reopen registered servers */
		bta_ag_start_servers(p_scb, p_scb->reg_services);
		@@ -408,7 +408,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		/* if not deregistering (deallocating) reopen registered servers */
		if (p_scb->dealloc == false) {
		/* Clear peer bd_addr so instance can be reused */
		p_scb->peer_addr = bd_addr_null;
		p_scb->peer_addr = bd_addr_empty;

		/* start only unopened server */
		services = p_scb->reg_services;

system/bta/av/bta_av_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1247,7 +1247,7 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) {
		/* the stream is closed.
		* clear the peer address, so it would not mess up the AVRCP for the next
		* round of operation */
		p_scb->peer_addr = bd_addr_null;
		p_scb->peer_addr = bd_addr_empty;
		if (p_scb->chnl == BTA_AV_CHNL_AUDIO) {
		if (p_lcb) {
		p_lcb->conn_msk &= ~conn_msk;

system/bta/dm/bta_dm_act.cc

+5 −6

Original line number	Diff line number	Diff line
		@@ -486,8 +486,8 @@ static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status) {
		void bta_dm_disable(UNUSED_ATTR tBTA_DM_MSG* p_data) {
		/* Set l2cap idle timeout to 0 (so BTE immediately disconnects ACL link after
		* last channel is closed) */
		L2CA_SetIdleTimeoutByBdAddr(BT_BD_ANY, 0, BT_TRANSPORT_BR_EDR);
		L2CA_SetIdleTimeoutByBdAddr(BT_BD_ANY, 0, BT_TRANSPORT_LE);
		L2CA_SetIdleTimeoutByBdAddr(bd_addr_any, 0, BT_TRANSPORT_BR_EDR);
		L2CA_SetIdleTimeoutByBdAddr(bd_addr_any, 0, BT_TRANSPORT_LE);

		/* disable all active subsystems */
		bta_sys_disable(BTA_SYS_HW_BLUETOOTH);
		@@ -755,8 +755,7 @@ void bta_dm_remove_device(tBTA_DM_MSG* p_data) {
		if (continue_delete_dev) bta_dm_process_remove_device(p_dev->bd_addr);

		/* Delete the other paired device too */
		bt_bdaddr_t dummy_bda = {.address = {0}};
		if (continue_delete_other_dev && other_address != dummy_bda)
		if (continue_delete_other_dev && other_address != bd_addr_empty)
		bta_dm_process_remove_device(other_address);
		}

		@@ -4589,7 +4588,7 @@ void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG* p_data) {
		if (bta_dm_search_cb.conn_id != BTA_GATT_INVALID_CONN_ID)
		BTA_GATTC_Close(bta_dm_search_cb.conn_id);

		bta_dm_search_cb.pending_close_bda = {.address = {0}};
		bta_dm_search_cb.pending_close_bda = bd_addr_empty;
		bta_dm_search_cb.conn_id = BTA_GATT_INVALID_CONN_ID;
		}
		/*******************************************************************************
		@@ -4608,7 +4607,7 @@ void btm_dm_start_gatt_discovery(const bt_bdaddr_t& bd_addr) {
		/* connection is already open */
		if (bta_dm_search_cb.pending_close_bda == bd_addr &&
		bta_dm_search_cb.conn_id != BTA_GATT_INVALID_CONN_ID) {
		bta_dm_search_cb.pending_close_bda = {.address = {0}};
		bta_dm_search_cb.pending_close_bda = bd_addr_empty;
		alarm_cancel(bta_dm_search_cb.gatt_close_timer);
		btm_dm_start_disc_gatt_services(bta_dm_search_cb.conn_id);
		} else {

system/bta/gatt/bta_gattc_utils.cc

+3 −5

Original line number	Diff line number	Diff line
		@@ -44,8 +44,6 @@ static const uint8_t base_uuid[LEN_UUID_128] = {
		0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80,
		0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

		static const bt_bdaddr_t dummy_bda = {.address = {0, 0, 0, 0, 0, 0}};

		/*******************************************************************************
		*
		* Function bta_gatt_convert_uuid16_to_uuid128
		@@ -490,7 +488,7 @@ bool bta_gattc_mark_bg_conn(tBTA_GATTC_IF client_if,

		for (i = 0; i < BTA_GATTC_KNOWN_SR_MAX; i++, p_bg_tck++) {
		if (p_bg_tck->in_use && ((p_bg_tck->remote_bda == remote_bda_ptr) \|\|
		(p_bg_tck->remote_bda == dummy_bda))) {
		(p_bg_tck->remote_bda == bd_addr_empty))) {
		p_cif_mask = &p_bg_tck->cif_mask;

		if (add) /* mask on the cif bit */
		@@ -548,7 +546,7 @@ bool bta_gattc_check_bg_conn(tBTA_GATTC_IF client_if,

		for (i = 0; i < BTA_GATTC_KNOWN_SR_MAX && !is_bg_conn; i++, p_bg_tck++) {
		if (p_bg_tck->in_use && (p_bg_tck->remote_bda == remote_bda \|\|
		p_bg_tck->remote_bda == dummy_bda)) {
		p_bg_tck->remote_bda == bd_addr_empty)) {
		if (((p_bg_tck->cif_mask & (1 << (client_if - 1))) != 0) &&
		role == HCI_ROLE_MASTER)
		is_bg_conn = true;
		@@ -667,7 +665,7 @@ bool bta_gattc_conn_dealloc(const bt_bdaddr_t& remote_bda) {

		if (p_conn != NULL) {
		p_conn->in_use = false;
		p_conn->remote_bda = {.address = {0}};
		p_conn->remote_bda = bd_addr_empty;
		return true;
		}
		return false;

system/bta/hd/bta_hd_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ extern void bta_hd_close_act(tBTA_HD_DATA* p_data) {
		}

		cback_data.conn.bda = p_cback->addr;
		bta_hd_cb.bd_addr = {.address = {0}};
		bta_hd_cb.bd_addr = bd_addr_empty;

		bta_hd_cb.p_cback(cback_event, &cback_data);
		}