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

Commit 4ae23131 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Remove bta_dm_proc_open_evt" into main am: 654ff67d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2899088



Change-Id: Iaa7e4d41ee749467d7fca1037aab502975fa087d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c27243d5 654ff67d

system/bta/dm/bta_dm_disc.cc

+0 −31
Original line number Diff line number Diff line
@@ -2066,37 +2066,6 @@ static void bta_dm_proc_open_evt(tBTA_GATTC_OPEN* p_data) { 
  }

}



void bta_dm_proc_close_evt(const tBTA_GATTC_CLOSE& close) {

  LOG_INFO("Gatt connection closed peer:%s reason:%s",

           ADDRESS_TO_LOGGABLE_CSTR(close.remote_bda),

           gatt_disconnection_reason_text(close.reason).c_str());



  disc_gatt_history_.Push(base::StringPrintf(

      "%-32s bd_addr:%s client_if:%hu status:%s event:%s",

      "GATTC_EventCallback", ADDRESS_TO_LOGGABLE_CSTR(close.remote_bda),

      close.client_if, gatt_status_text(close.status).c_str(),

      gatt_client_event_text(BTA_GATTC_CLOSE_EVT).c_str()));



  if (close.remote_bda == bta_dm_search_cb.peer_bdaddr) {

    if (bluetooth::common::init_flags::

            bta_dm_clear_conn_id_on_client_close_is_enabled()) {

      LOG_DEBUG("Clearing connection id on client close");

      bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;

    }

  } else {

    LOG_WARN("Received close event for unknown peer:%s",

             ADDRESS_TO_LOGGABLE_CSTR(close.remote_bda));

  }



  /* in case of disconnect before search is completed */

  if ((bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) &&

      (bta_dm_search_cb.state != BTA_DM_SEARCH_ACTIVE) &&

      close.remote_bda == bta_dm_search_cb.peer_bdaddr) {

    bta_dm_gatt_disc_complete((uint16_t)GATT_INVALID_CONN_ID,

                              (tGATT_STATUS)GATT_ERROR);

  }

}



/*******************************************************************************

 *

 * Function         bta_dm_gattc_callback