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

Commit 67a37a9e authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Extend debugging logs for transport connection" into main am: e97bef59 

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



Change-Id: I6c09924ddfb834e2132a8630530fa3d921fa9a69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8cf857f e97bef59

system/bta/csis/csis_client.cc

+11 −2
Original line number Diff line number Diff line
@@ -1901,8 +1901,17 @@ class CsisClientImpl : public CsisClient { 
  }



  void OnGattConnected(const tBTA_GATTC_OPEN& evt) {

    LOG_DEBUG("address= %s, conn_id= 0x%04x",

              ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda), evt.conn_id);

    LOG_INFO("%s, conn_id=0x%04x, transport=%s, status=%s(0x%02x)",

             ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda), evt.conn_id,

             bt_transport_text(evt.transport).c_str(),

             gatt_status_text(evt.status).c_str(), evt.status);



    if (evt.transport != BT_TRANSPORT_LE) {

      LOG_WARN("Only LE connection is allowed (transport %s)",

               bt_transport_text(evt.transport).c_str());

      BTA_GATTC_Close(evt.conn_id);

      return;

    }



    auto device = FindDeviceByAddress(evt.remote_bda);

    if (device == nullptr) {

system/bta/has/has_client.cc

+11 −3
Original line number Diff line number Diff line
@@ -1836,9 +1836,17 @@ class HasClientImpl : public HasClient { 
  }



  void OnGattConnected(const tBTA_GATTC_OPEN& evt) {

    DLOG(INFO) << __func__ << ": address="

               << ADDRESS_TO_LOGGABLE_STR(evt.remote_bda)

               << ", conn_id=" << evt.conn_id;

    LOG_INFO("%s, conn_id=0x%04x, transport=%s, status=%s(0x%02x)",

             ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda), evt.conn_id,

             bt_transport_text(evt.transport).c_str(),

             gatt_status_text(evt.status).c_str(), evt.status);



    if (evt.transport != BT_TRANSPORT_LE) {

      LOG_WARN("Only LE connection is allowed (transport %s)",

               bt_transport_text(evt.transport).c_str());

      BTA_GATTC_Close(evt.conn_id);

      return;

    }



    auto device = std::find_if(devices_.begin(), devices_.end(),

                               HasDevice::MatchAddress(evt.remote_bda));

system/bta/le_audio/client.cc

+12 −2
Original line number Diff line number Diff line
@@ -1865,9 +1865,19 @@ class LeAudioClientImpl : public LeAudioClient { 
                       tBT_TRANSPORT transport, uint16_t mtu) {

    LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address);



    if (!leAudioDevice) return;

    LOG_INFO("%s, conn_id=0x%04x, transport=%s, status=%s (0x%02x)",

             ADDRESS_TO_LOGGABLE_CSTR(address), conn_id,

             bt_transport_text(transport).c_str(),

             gatt_status_text(status).c_str(), status);



    LOG_INFO("%s, status 0x%02x", ADDRESS_TO_LOGGABLE_CSTR(address), status);

    if (transport != BT_TRANSPORT_LE) {

      LOG_WARN("Only LE connection is allowed (transport %s)",

               bt_transport_text(transport).c_str());

      BTA_GATTC_Close(conn_id);

      return;

    }



    if (!leAudioDevice) return;



    if (status != GATT_SUCCESS) {

      /* Clear current connection request and let it be set again if needed */

system/bta/vc/vc.cc

+12 −3
Original line number Diff line number Diff line
@@ -145,9 +145,18 @@ class VolumeControlImpl : public VolumeControl { 


  void OnGattConnected(tGATT_STATUS status, uint16_t connection_id,

                       tGATT_IF /*client_if*/, RawAddress address,

                       tBT_TRANSPORT /*transport*/, uint16_t /*mtu*/) {

    LOG(INFO) << __func__ << ": address=" << ADDRESS_TO_LOGGABLE_STR(address)

              << ", connection_id=" << connection_id;

                       tBT_TRANSPORT transport, uint16_t /*mtu*/) {

    LOG_INFO("%s, conn_id=0x%04x, transport=%s, status=%s(0x%02x)",

             ADDRESS_TO_LOGGABLE_CSTR(address), connection_id,

             bt_transport_text(transport).c_str(),

             gatt_status_text(status).c_str(), status);



    if (transport != BT_TRANSPORT_LE) {

      LOG_WARN("Only LE connection is allowed (transport %s)",

               bt_transport_text(transport).c_str());

      BTA_GATTC_Close(connection_id);

      return;

    }



    VolumeControlDevice* device =

        volume_control_devices_.FindByAddress(address);