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

Commit a33568e3 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Minor GATT logging fixes am: d8f3c419 am: 6e0212f1 

am: c3e302d6

Change-Id: I92ddd659f359b14befa18b03e319b6db63c53388
parents 2f3846e2 c3e302d6

system/bta/gatt/bta_gattc_cache.cc

+3 −13
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void add_service_to_gatt_db(std::vector<tBTA_GATTC_SERVICE>& gatt_db, 
                                   uint16_t s_handle, uint16_t e_handle,

                                   const Uuid& uuid, bool is_primary) {

#if (BTA_GATT_DEBUG == TRUE)

  VLOG(1) << "Add a service into Service";

  VLOG(1) << "Add a service into GATT DB";

#endif



  gatt_db.emplace_back(tBTA_GATTC_SERVICE{
@@ -902,21 +902,11 @@ void bta_gattc_get_gatt_db(uint16_t conn_id, uint16_t start_handle, 
                             count);

}



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

 *

 * Function         bta_gattc_rebuild_cache

 *

 * Description      rebuild server cache from NV cache.

 *

 * Parameters

 *

 * Returns          None.

 *

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

/* rebuild server cache from NV cache */

void bta_gattc_rebuild_cache(tBTA_GATTC_SERV* p_srvc_cb, uint16_t num_attr,

                             tBTA_GATTC_NV_ATTR* p_attr) {

  /* first attribute loading, initialize buffer */

  LOG(ERROR) << __func__;

  LOG(INFO) << __func__ << " " << num_attr;



  // clear reallocating

  std::vector<tBTA_GATTC_SERVICE>().swap(p_srvc_cb->srvc_cache);

system/bta/gatt/bta_gatts_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ void bta_gatts_register(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg) { 
    cb_data.reg_oper.server_if = BTA_GATTS_INVALID_IF;

    cb_data.reg_oper.uuid = p_msg->api_reg.app_uuid;

    if (first_unuse != 0xff) {

      LOG(ERROR) << "register application first_unuse rcb_idx=" << +first_unuse;

      LOG(INFO) << "register application first_unuse rcb_idx=" << +first_unuse;



      p_cb->rcb[first_unuse].in_use = true;

      p_cb->rcb[first_unuse].p_cback = p_msg->api_reg.p_cback;

system/bta/gatt/bta_gatts_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ extern uint16_t BTA_GATTS_AddService( 
  uint8_t rcb_idx =

      bta_gatts_find_app_rcb_idx_by_app_if(&bta_gatts_cb, server_if);



  LOG(ERROR) << __func__ << ": rcb_idx=" << +rcb_idx;

  LOG(INFO) << __func__ << ": rcb_idx=" << +rcb_idx;



  if (rcb_idx == BTA_GATTS_INVALID_APP) return GATT_ERROR;