Get rid of BTA_GATTC_API_REFRESH_EVT (1ad4c569) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+12 −4

Original line number	Diff line number	Diff line
		@@ -665,7 +665,9 @@ void bta_dm_process_remove_device(BD_ADDR bd_addr) {
		BTM_SecDeleteDevice(bd_addr);

		/* remove all cached GATT information */
		BTA_GATTC_Refresh(bd_addr);
		bt_bdaddr_t tmp_addr;
		memcpy(tmp_addr.address, bd_addr, BD_ADDR_LEN);
		BTA_GATTC_Refresh(tmp_addr);

		if (bta_dm_cb.p_sec_cback) {
		tBTA_DM_SEC sec_event;
		@@ -848,7 +850,9 @@ void bta_dm_close_acl(tBTA_DM_MSG* p_data) {
		/* need to remove all pending background connection if any */
		BTA_GATTC_CancelOpen(0, p_remove_acl->bd_addr, false);
		/* remove all cached GATT information */
		BTA_GATTC_Refresh(p_remove_acl->bd_addr);
		bt_bdaddr_t tmp_addr;
		memcpy(tmp_addr.address, p_remove_acl->bd_addr, BD_ADDR_LEN);
		BTA_GATTC_Refresh(tmp_addr);
		}
		/* otherwise, no action needed */
		}
		@@ -3110,7 +3114,9 @@ void bta_dm_acl_change(tBTA_DM_MSG* p_data) {
		/* need to remove all pending background connection */
		BTA_GATTC_CancelOpen(0, p_bda, false);
		/* remove all cached GATT information */
		BTA_GATTC_Refresh(p_bda);
		bt_bdaddr_t tmp_addr;
		memcpy(tmp_addr.address, p_bda, BD_ADDR_LEN);
		BTA_GATTC_Refresh(tmp_addr);
		}

		bdcpy(conn.link_down.bd_addr, p_bda);
		@@ -3283,7 +3289,9 @@ static void bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr) {
		/* need to remove all pending background connection */
		BTA_GATTC_CancelOpen(0, remote_bd_addr, false);
		/* remove all cached GATT information */
		BTA_GATTC_Refresh(remote_bd_addr);
		bt_bdaddr_t tmp_addr;
		memcpy(tmp_addr.address, remote_bd_addr, BD_ADDR_LEN);
		BTA_GATTC_Refresh(tmp_addr);
		}
		}

system/bta/gatt/bta_gattc_act.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -1391,9 +1391,8 @@ static void bta_gattc_enc_cmpl_cback(tGATT_IF gattc_if, BD_ADDR bda) {
		* Returns None.
		*
		******************************************************************************/
		void bta_gattc_process_api_refresh(tBTA_GATTC_DATA* p_msg) {
		tBTA_GATTC_SERV* p_srvc_cb =
		bta_gattc_find_srvr_cache(p_msg->api_conn.remote_bda);
		void bta_gattc_process_api_refresh(bt_bdaddr_t remote_bda) {
		tBTA_GATTC_SERV* p_srvc_cb = bta_gattc_find_srvr_cache(remote_bda.address);
		tBTA_GATTC_CLCB* p_clcb = &bta_gattc_cb.clcb[0];
		bool found = false;
		uint8_t i;
		@@ -1419,7 +1418,7 @@ void bta_gattc_process_api_refresh(tBTA_GATTC_DATA* p_msg) {
		}
		}
		/* used to reset cache in application */
		bta_gattc_cache_reset(p_msg->api_conn.remote_bda);
		bta_gattc_cache_reset(remote_bda.address);
		}
		/*******************************************************************************
		*

system/bta/gatt/bta_gattc_api.cc

+3 −8

Original line number	Diff line number	Diff line
		@@ -732,12 +732,7 @@ tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications(tBTA_GATTC_IF client_if,
		* Returns void
		*
		******************************************************************************/
		void BTA_GATTC_Refresh(const BD_ADDR remote_bda) {
		tBTA_GATTC_API_OPEN* p_buf =
		(tBTA_GATTC_API_OPEN*)osi_malloc(sizeof(tBTA_GATTC_API_OPEN));

		p_buf->hdr.event = BTA_GATTC_API_REFRESH_EVT;
		memcpy(p_buf->remote_bda, remote_bda, BD_ADDR_LEN);

		bta_sys_sendmsg(p_buf);
		void BTA_GATTC_Refresh(const bt_bdaddr_t& remote_bda) {
		do_in_bta_thread(FROM_HERE,
		base::Bind(&bta_gattc_process_api_refresh, remote_bda));
		}

system/bta/gatt/bta_gattc_int.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ enum {
		BTA_GATTC_API_SEARCH_EVT,
		BTA_GATTC_API_CONFIRM_EVT,
		BTA_GATTC_API_READ_MULTI_EVT,
		BTA_GATTC_API_REFRESH_EVT,

		BTA_GATTC_INT_CONN_EVT,
		BTA_GATTC_INT_DISCOVER_EVT,
		@@ -395,7 +394,7 @@ extern void bta_gattc_send_open_cback(tBTA_GATTC_RCB* p_clreg,
		tBTA_GATT_STATUS status,
		BD_ADDR remote_bda, uint16_t conn_id,
		tBTA_TRANSPORT transport, uint16_t mtu);
		extern void bta_gattc_process_api_refresh(tBTA_GATTC_DATA* p_msg);
		extern void bta_gattc_process_api_refresh(bt_bdaddr_t remote_bda);
		extern void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data);
		extern void bta_gattc_listen(tBTA_GATTC_DATA* p_msg);
		extern void bta_gattc_broadcast(tBTA_GATTC_DATA* p_msg);

system/bta/gatt/bta_gattc_main.cc

+0 −14

Original line number	Diff line number	Diff line
		@@ -125,8 +125,6 @@ static const uint8_t bta_gattc_st_idle[][BTA_GATTC_NUM_COLS] = {
		/* BTA_GATTC_API_SEARCH_EVT */ {BTA_GATTC_FAIL, BTA_GATTC_IDLE_ST},
		/* BTA_GATTC_API_CONFIRM_EVT */ {BTA_GATTC_FAIL, BTA_GATTC_IDLE_ST},
		/* BTA_GATTC_API_READ_MULTI_EVT */ {BTA_GATTC_FAIL, BTA_GATTC_IDLE_ST},
		/* BTA_GATTC_API_REFRESH_EVT */ {BTA_GATTC_IGNORE,
		BTA_GATTC_IDLE_ST},

		/* BTA_GATTC_INT_CONN_EVT */ {BTA_GATTC_CONN, BTA_GATTC_CONN_ST},
		/* BTA_GATTC_INT_DISCOVER_EVT */ {BTA_GATTC_IGNORE,
		@@ -169,8 +167,6 @@ static const uint8_t bta_gattc_st_w4_conn[][BTA_GATTC_NUM_COLS] = {
		BTA_GATTC_W4_CONN_ST},
		/* BTA_GATTC_API_READ_MULTI_EVT */ {BTA_GATTC_FAIL,
		BTA_GATTC_W4_CONN_ST},
		/* BTA_GATTC_API_REFRESH_EVT */ {BTA_GATTC_IGNORE,
		BTA_GATTC_W4_CONN_ST},

		/* BTA_GATTC_INT_CONN_EVT */ {BTA_GATTC_CONN, BTA_GATTC_CONN_ST},
		/* BTA_GATTC_INT_DISCOVER_EVT */ {BTA_GATTC_IGNORE,
		@@ -209,8 +205,6 @@ static const uint8_t bta_gattc_st_connected[][BTA_GATTC_NUM_COLS] = {
		BTA_GATTC_CONN_ST},
		/* BTA_GATTC_API_READ_MULTI_EVT */ {BTA_GATTC_READ_MULTI,
		BTA_GATTC_CONN_ST},
		/* BTA_GATTC_API_REFRESH_EVT */ {BTA_GATTC_IGNORE,
		BTA_GATTC_CONN_ST},

		/* BTA_GATTC_INT_CONN_EVT */ {BTA_GATTC_IGNORE,
		BTA_GATTC_CONN_ST},
		@@ -255,8 +249,6 @@ static const uint8_t bta_gattc_st_discover[][BTA_GATTC_NUM_COLS] = {
		BTA_GATTC_DISCOVER_ST},
		/* BTA_GATTC_API_READ_MULTI_EVT */ {BTA_GATTC_Q_CMD,
		BTA_GATTC_DISCOVER_ST},
		/* BTA_GATTC_API_REFRESH_EVT */ {BTA_GATTC_IGNORE,
		BTA_GATTC_DISCOVER_ST},

		/* BTA_GATTC_INT_CONN_EVT */ {BTA_GATTC_CONN,
		BTA_GATTC_DISCOVER_ST},
		@@ -376,10 +368,6 @@ bool bta_gattc_hdl_event(BT_HDR* p_msg) {
		bta_gattc_process_api_open_cancel((tBTA_GATTC_DATA*)p_msg);
		break;

		case BTA_GATTC_API_REFRESH_EVT:
		bta_gattc_process_api_refresh((tBTA_GATTC_DATA*)p_msg);
		break;

		default:
		if (p_msg->event == BTA_GATTC_INT_CONN_EVT)
		p_clcb = bta_gattc_find_int_conn_clcb((tBTA_GATTC_DATA*)p_msg);
		@@ -449,8 +437,6 @@ static char* gattc_evt_code(tBTA_GATTC_INT_EVT evt_code) {
		return "BTA_GATTC_OP_CMPL_EVT";
		case BTA_GATTC_INT_DISCONN_EVT:
		return "BTA_GATTC_INT_DISCONN_EVT";
		case BTA_GATTC_API_REFRESH_EVT:
		return "BTA_GATTC_API_REFRESH_EVT";
		case BTA_GATTC_API_CFG_MTU_EVT:
		return "BTA_GATTC_API_CFG_MTU_EVT";
		default: