From b89a2dd3b0c8988989320fa4bdc6f0d6abe0d99e Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Mon, 17 Aug 2020 13:11:28 -0700 Subject: [PATCH] Remove variables never set for discovery Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: Ic10a53f160d86737da4ef7ef29f584331edca9f8 --- bta/dm/bta_dm_act.cc | 9 --------- bta/dm/bta_dm_int.h | 3 --- 2 files changed, 12 deletions(-) diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc index a6b52a202..123b56df6 100644 --- a/bta/dm/bta_dm_act.cc +++ b/bta/dm/bta_dm_act.cc @@ -873,7 +873,6 @@ void bta_dm_search_cancel() { * ******************************************************************************/ void bta_dm_discover(tBTA_DM_MSG* p_data) { - size_t len = sizeof(Uuid) * p_data->discover.num_uuid; APPL_TRACE_EVENT("%s services_to_search=0x%04X", __func__, p_data->discover.services); @@ -881,13 +880,6 @@ void bta_dm_discover(tBTA_DM_MSG* p_data) { bta_dm_search_cb.services = p_data->discover.services; bta_dm_gattc_register(); - osi_free_and_reset((void**)&bta_dm_search_cb.p_srvc_uuid); - if ((bta_dm_search_cb.num_uuid = p_data->discover.num_uuid) != 0 && - p_data->discover.p_uuid != NULL) { - bta_dm_search_cb.p_srvc_uuid = (Uuid*)osi_malloc(len); - *bta_dm_search_cb.p_srvc_uuid = *p_data->discover.p_uuid; - } - bta_dm_search_cb.uuid_to_search = bta_dm_search_cb.num_uuid; bta_dm_search_cb.p_search_cback = p_data->discover.p_cback; bta_dm_search_cb.services_to_search = bta_dm_search_cb.services; @@ -898,7 +890,6 @@ void bta_dm_discover(tBTA_DM_MSG* p_data) { bta_dm_search_cb.transport = p_data->discover.transport; bta_dm_search_cb.name_discover_done = false; - bta_dm_search_cb.uuid = p_data->discover.uuid; bta_dm_discover_device(p_data->discover.bd_addr); } diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h index 69fbc9910..6468dc735 100644 --- a/bta/dm/bta_dm_int.h +++ b/bta/dm/bta_dm_int.h @@ -77,9 +77,6 @@ typedef struct { tBTA_SERVICE_MASK services; tBTA_DM_SEARCH_CBACK* p_cback; tBT_TRANSPORT transport; - uint8_t num_uuid; - bluetooth::Uuid* p_uuid; - bluetooth::Uuid uuid; } tBTA_DM_API_DISCOVER; /* data type for BTA_DM_API_DI_DISC_EVT */ -- 2.11.0