OSDN Git Service

bta_mce_get_remote_mas_instances is never referenced
authorZach Johnson <zachoverflow@google.com>
Fri, 28 Aug 2020 22:59:34 +0000 (15:59 -0700)
committerZach Johnson <zachoverflow@google.com>
Fri, 28 Aug 2020 23:00:51 +0000 (16:00 -0700)
Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id7586339efb0c325aa58d6501147a90a74526bab

bta/mce/bta_mce_act.cc

index da21042..5b97757 100644 (file)
@@ -37,130 +37,3 @@ using bluetooth::Uuid;
 /*****************************************************************************
  *  Constants
  ****************************************************************************/
-
-static const Uuid bta_mce_mas_uuid =
-    Uuid::From16Bit(UUID_SERVCLASS_MESSAGE_ACCESS);
-
-/*******************************************************************************
- *
- * Function     bta_mce_search_cback
- *
- * Description  Callback from btm after search is completed
- *
- * Returns      void
- *
- ******************************************************************************/
-
-static void bta_mce_search_cback(uint16_t result, void* user_data) {
-  tSDP_DISC_REC* p_rec = NULL;
-  tBTA_MCE_MAS_DISCOVERY_COMP evt_data;
-  int found = 0;
-
-  APPL_TRACE_DEBUG("bta_mce_start_discovery_cback res: 0x%x", result);
-
-  bta_mce_cb.sdp_active = BTA_MCE_SDP_ACT_NONE;
-
-  if (bta_mce_cb.p_dm_cback == NULL) return;
-
-  evt_data.status = BTA_MCE_FAILURE;
-  evt_data.remote_addr = bta_mce_cb.remote_addr;
-  evt_data.num_mas = 0;
-
-  if (result == SDP_SUCCESS || result == SDP_DB_FULL) {
-    do {
-      tSDP_DISC_ATTR* p_attr;
-      tSDP_PROTOCOL_ELEM pe;
-
-      p_rec = SDP_FindServiceUUIDInDb(p_bta_mce_cfg->p_sdp_db, bta_mce_mas_uuid,
-                                      p_rec);
-
-      APPL_TRACE_DEBUG("p_rec:%p", p_rec);
-
-      if (p_rec == NULL) break;
-
-      if (!SDP_FindProtocolListElemInRec(p_rec, UUID_PROTOCOL_RFCOMM, &pe))
-        continue;
-
-      evt_data.mas[found].scn = pe.params[0];
-
-      p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
-      if (p_attr == NULL) continue;
-
-      evt_data.mas[found].p_srv_name = (char*)p_attr->attr_value.v.array;
-      evt_data.mas[found].srv_name_len =
-          SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
-
-      p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAS_INSTANCE_ID);
-      if (p_attr == NULL) break;
-
-      evt_data.mas[found].instance_id = p_attr->attr_value.v.u8;
-
-      p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_MSG_TYPE);
-      if (p_attr == NULL) break;
-
-      evt_data.mas[found].msg_type = p_attr->attr_value.v.u8;
-
-      found++;
-    } while (p_rec != NULL && found < BTA_MCE_MAX_MAS_INSTANCES);
-
-    evt_data.num_mas = found;
-    evt_data.status = BTA_MCE_SUCCESS;
-  }
-
-  tBTA_MCE bta_mce;
-  bta_mce.mas_disc_comp = evt_data;
-  bta_mce_cb.p_dm_cback(BTA_MCE_MAS_DISCOVERY_COMP_EVT, &bta_mce, user_data);
-}
-
-/*******************************************************************************
- *
- * Function     bta_mce_get_remote_mas_instances
- *
- * Description  Discovers MAS instances on remote device
- *
- * Returns      void
- *
- ******************************************************************************/
-void bta_mce_get_remote_mas_instances(tBTA_MCE_MSG* p_data) {
-  if (p_data == NULL) {
-    APPL_TRACE_DEBUG("MCE control block handle is null");
-    return;
-  }
-  tBTA_MCE_STATUS status = BTA_MCE_FAILURE;
-
-  APPL_TRACE_DEBUG("%s in, sdp_active:%d", __func__, bta_mce_cb.sdp_active);
-
-  if (bta_mce_cb.sdp_active != BTA_MCE_SDP_ACT_NONE) {
-    /* SDP is still in progress */
-    status = BTA_MCE_BUSY;
-    if (bta_mce_cb.p_dm_cback) {
-      tBTA_MCE bta_mce;
-      bta_mce.status = status;
-      bta_mce_cb.p_dm_cback(BTA_MCE_MAS_DISCOVERY_COMP_EVT, &bta_mce, NULL);
-    }
-
-    return;
-  }
-
-  bta_mce_cb.sdp_active = BTA_MCE_SDP_ACT_YES;
-  bta_mce_cb.remote_addr = p_data->get_rmt_mas.bd_addr;
-
-  SDP_InitDiscoveryDb(p_bta_mce_cfg->p_sdp_db, p_bta_mce_cfg->sdp_db_size, 1,
-                      &bta_mce_mas_uuid, 0, NULL);
-
-  if (!SDP_ServiceSearchAttributeRequest2(p_data->get_rmt_mas.bd_addr,
-                                          p_bta_mce_cfg->p_sdp_db,
-                                          bta_mce_search_cback, NULL)) {
-    bta_mce_cb.sdp_active = BTA_MCE_SDP_ACT_NONE;
-
-    /* failed to start SDP. report the failure right away */
-    if (bta_mce_cb.p_dm_cback) {
-      tBTA_MCE bta_mce;
-      bta_mce.status = status;
-      bta_mce_cb.p_dm_cback(BTA_MCE_MAS_DISCOVERY_COMP_EVT, &bta_mce, NULL);
-    }
-  }
-  /*
-  else report the result when the cback is called
-  */
-}