Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12470d93 authored by Zach Johnson's avatar Zach Johnson
Browse files

Nothing interesting happens with ble_raw_size or ble_raw_used 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic31092da6df5b9f203e5a45ccbfdcbd651c4ad71
parent d1f3f59b

system/bta/dm/bta_dm_act.cc

+0 −16
Original line number Diff line number Diff line
@@ -1608,10 +1608,6 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
        if (bta_dm_search_cb.services_to_search & BTA_BLE_SERVICE_MASK) {

          // set the raw data buffer here

          memset(g_disc_raw_data_buf, 0, sizeof(g_disc_raw_data_buf));



          bta_dm_search_cb.ble_raw_size = MAX_DISC_RAW_DATA_BUF;

          bta_dm_search_cb.ble_raw_used = 0;



          /* start GATT for service discovery */

          btm_dm_start_gatt_discovery(bta_dm_search_cb.peer_bdaddr);

          return;
@@ -3544,18 +3540,6 @@ static void bta_dm_gatt_disc_result(tBTA_GATT_ID service_id) { 
   * just copy the GATTID in raw data field and send it across.

   */



  if (bta_dm_search_cb.ble_raw_used + sizeof(tBTA_GATT_ID) <

      bta_dm_search_cb.ble_raw_size) {

    APPL_TRACE_DEBUG("ADDING BLE SERVICE uuid=%s, ble_raw_used = 0x%x",

                     service_id.uuid.ToString().c_str(),

                     bta_dm_search_cb.ble_raw_used);

  } else {

    APPL_TRACE_ERROR(

        "%s out of room to accomodate more service ids ble_raw_size = %d "

        "ble_raw_used = %d",

        __func__, bta_dm_search_cb.ble_raw_size, bta_dm_search_cb.ble_raw_used);

  }



  LOG_INFO("%s service_id_uuid_len=%zu", __func__,

           service_id.uuid.GetShortestRepresentationSize());

  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) {

system/bta/dm/bta_dm_int.h

+0 −2
Original line number Diff line number Diff line
@@ -326,8 +326,6 @@ typedef struct { 
  uint8_t uuid_to_search;

  bool gatt_disc_active;

  uint16_t conn_id;

  uint32_t ble_raw_size;

  uint32_t ble_raw_used;

  alarm_t* gatt_close_timer; /* GATT channel close delay timer */

  RawAddress pending_close_bda; /* pending GATT channel remote device address */