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

Commit 81feb8f4 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-log bta/gatt/bta_gattc_act::bta_gattc_close am: 0a3bb3c4 am: c6b7f4a0 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b439c31c46f9296824b1470c9d83444d3aa395b
parents 11989413 c6b7f4a0

system/bta/gatt/bta_gattc_act.cc

+10 −5
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "osi/include/log.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"

#include "stack/include/btu.h"

#include "stack/include/btu.h"

#include "stack/include/gatt_api.h"

#include "utl.h"

#include "utl.h"





#include "bta_hh_int.h"

#include "bta_hh_int.h"
@@ -553,14 +554,18 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 




  if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {

  if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {

    GATT_Disconnect(p_data->hdr.layer_specific);

    GATT_Disconnect(p_data->hdr.layer_specific);

    LOG_DEBUG("Local close event client_if:%hu conn_id:%hu reason:%hu",

    LOG_DEBUG("Local close event client_if:%hu conn_id:%hu reason:%s",

              cb_data.close.client_if, cb_data.close.conn_id,

              cb_data.close.client_if, cb_data.close.conn_id,

              cb_data.close.reason);

              gatt_disconnection_reason_text(

                  static_cast<tGATT_DISCONN_REASON>(cb_data.close.reason))

                  .c_str());

  } else if (p_data->hdr.event == BTA_GATTC_INT_DISCONN_EVT) {

  } else if (p_data->hdr.event == BTA_GATTC_INT_DISCONN_EVT) {

    cb_data.close.reason = p_data->int_conn.reason;

    cb_data.close.reason = p_data->int_conn.reason;

    LOG_DEBUG(

    LOG_DEBUG("Peer close disconnect event client_if:%hu conn_id:%hu reason:%s",

        "Peer close disconnect event client_if:%hu conn_id:%hu reason:%hu",

              cb_data.close.client_if, cb_data.close.conn_id,

        cb_data.close.client_if, cb_data.close.conn_id, cb_data.close.reason);

              gatt_disconnection_reason_text(

                  static_cast<tGATT_DISCONN_REASON>(cb_data.close.reason))

                  .c_str());

  }

  }





  if (p_cback) (*p_cback)(BTA_GATTC_CLOSE_EVT, &cb_data);

  if (p_cback) (*p_cback)(BTA_GATTC_CLOSE_EVT, &cb_data);