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

Commit f8a76381 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6940725 from 7c7540e0 to sc-release 

Change-Id: I6b25771a4e4aba19c0454dfd057e8ab9a0139bc3
parents 39ac173a 7c7540e0

system/bta/gatt/bta_gattc_act.cc

+2 −5
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ void bta_gattc_close_fail(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 
    cb_data.close.client_if = p_clcb->p_rcb->client_if;

    cb_data.close.conn_id = p_data->hdr.layer_specific;

    cb_data.close.remote_bda = p_clcb->bda;

    cb_data.close.status = GATT_ERROR;

    cb_data.close.reason = BTA_GATT_CONN_NONE;



    LOG(WARNING) << __func__ << ": conn_id=" << loghex(cb_data.close.conn_id)
@@ -533,7 +532,6 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 
  cb_data.close.client_if = p_clcb->p_rcb->client_if;

  cb_data.close.conn_id = p_clcb->bta_conn_id;

  cb_data.close.reason = p_clcb->reason;

  cb_data.close.status = p_clcb->status;

  cb_data.close.remote_bda = p_clcb->bda;



  if (p_clcb->transport == BT_TRANSPORT_BR_EDR)
@@ -542,9 +540,8 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 
  bta_gattc_clcb_dealloc(p_clcb);



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

    cb_data.close.status = GATT_Disconnect(p_data->hdr.layer_specific);

    GATT_Disconnect(p_data->hdr.layer_specific);

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

    cb_data.close.status = static_cast<tGATT_STATUS>(p_data->int_conn.reason);

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

  }
@@ -1033,7 +1030,7 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr, 
    LOG_INFO("Disconnected att_id:%hhu transport:%s reason:%s", gattc_if,

             BtTransportText(transport).c_str(),

             hci_error_code_text(reason).c_str());

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, reason);

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, GATT_CONN_UNKNOWN);

  }



  tBTA_GATTC_DATA* p_buf =

system/bta/gatt/bta_gatts_act.cc

+2 −4
Original line number Diff line number Diff line
@@ -593,13 +593,12 @@ static void bta_gatts_conn_cback(tGATT_IF gatt_if, const RawAddress& bdaddr, 
  tBTA_GATTS_RCB* p_reg;



  VLOG(1) << __func__ << "  bda=" << bdaddr << " gatt_if= " << gatt_if

          << ", conn_id=" << loghex(conn_id) << " connected=" << connected

          << ", reason=" << loghex(reason);

          << ", conn_id=" << loghex(conn_id) << " connected=" << connected;



  if (connected)

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_CONNECTED, GATT_CONN_UNKNOWN);

  else

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, reason);

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, GATT_CONN_UNKNOWN);



  p_reg = bta_gatts_find_app_rcb_by_app_if(gatt_if);
@@ -614,7 +613,6 @@ static void bta_gatts_conn_cback(tGATT_IF gatt_if, const RawAddress& bdaddr, 


    cb_data.conn.conn_id = conn_id;

    cb_data.conn.server_if = gatt_if;

    cb_data.conn.reason = reason;

    cb_data.conn.transport = transport;

    cb_data.conn.remote_bda = bdaddr;

    (*p_reg->p_cback)(evt, &cb_data);

system/bta/hearing_aid/hearing_aid.cc

+4 −6
Original line number Diff line number Diff line
@@ -1467,9 +1467,8 @@ class HearingAidImpl : public HearingAid { 
    DoDisconnectAudioStop();

  }



  void OnGattDisconnected(tGATT_STATUS status, uint16_t conn_id,

                          tGATT_IF client_if, RawAddress remote_bda,

                          tBTA_GATT_REASON reason) {

  void OnGattDisconnected(uint16_t conn_id, tGATT_IF client_if,

                          RawAddress remote_bda) {

    HearingDevice* hearingDevice = hearingDevices.FindByConnId(conn_id);

    if (!hearingDevice) {

      VLOG(2) << "Skipping unknown device disconnect, conn_id="
@@ -1477,7 +1476,7 @@ class HearingAidImpl : public HearingAid { 
      return;

    }

    VLOG(2) << __func__ << ": conn_id=" << loghex(conn_id)

            << ", reason=" << loghex(reason) << ", remote_bda=" << remote_bda;

            << ", remote_bda=" << remote_bda;



    // Inform the other side (if any) of this disconnection

    std::vector<uint8_t> inform_disconn_state(
@@ -1688,8 +1687,7 @@ void hearingaid_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
    case BTA_GATTC_CLOSE_EVT: {

      if (!instance) return;

      tBTA_GATTC_CLOSE& c = p_data->close;

      instance->OnGattDisconnected(c.status, c.conn_id, c.client_if,

                                   c.remote_bda, c.reason);

      instance->OnGattDisconnected(c.conn_id, c.client_if, c.remote_bda);

    } break;



    case BTA_GATTC_SEARCH_CMPL_EVT:

system/bta/include/bta_api.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "bt_types.h"

#include "btm_api.h"

#include "btm_ble_api.h"

#include "types/ble_address_with_type.h"

#include "types/bt_transport.h"



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

system/bta/include/bta_gatt_api.h

+0 −2
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ typedef struct { 
} tBTA_GATTC_OPEN;



typedef struct {

  tGATT_STATUS status;

  uint16_t conn_id;

  tGATT_IF client_if;

  RawAddress remote_bda;
@@ -352,7 +351,6 @@ typedef struct { 
  tGATT_IF server_if;

  RawAddress remote_bda;

  uint16_t conn_id;

  tBTA_GATT_REASON reason; /* report disconnect reason */

  tBT_TRANSPORT transport;

} tBTA_GATTS_CONN;