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

Commit 874237af authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

csis: Add debugdump am: d853b3a6 am: c5681f6d am: 42f63373 am: 028cd534 am: a731e273 

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

Change-Id: If842704cbdcb9b17b025f6a4c99aac913daff023
parents 7940dbf4 a731e273

system/bta/csis/csis_client.cc

+35 −2
Original line number Original line Diff line number Diff line
@@ -608,9 +608,42 @@ class CsisClientImpl : public CsisClient { 




  void Dump(int fd) {

  void Dump(int fd) {

    std::stringstream stream;

    std::stringstream stream;

    for (const auto& device : devices_) {



      stream << "  " << device->addr << " " << std::endl;

    stream << "  Groups\n";

    for (const auto& g : csis_groups_) {

      stream << "    == id: " << g->GetGroupId() << " ==\n"

             << "    uuid: " << g->GetUuid() << "\n"

             << "    desired size: " << g->GetDesiredSize() << "\n"

             << "    discoverable state: "

             << static_cast<int>(g->GetDiscoveryState()) << "\n"

             << "    current lock state: "

             << static_cast<int>(g->GetCurrentLockState()) << "\n"

             << "    target lock state: "

             << static_cast<int>(g->GetTargetLockState()) << "\n"

             << "    devices: \n";

      for (auto& device : devices_) {

        if (!g->IsDeviceInTheGroup(device)) continue;



        stream << "        == addr: " << device->addr << " ==\n"

               << "        csis instance: data:"

               << "\n";



        auto instance = device->GetCsisInstanceByGroupId(g->GetGroupId());

        if (!instance) {

          stream << "          No csis instance available\n";

        } else {

          stream << "          rank: " << instance->GetRank() << "\n";

        }

        }



        if (!device->IsConnected()) {

          stream << "        Not connected\n";

        } else {

          stream << "        Connected conn_id = "

                 << std::to_string(device->conn_id) << "\n";

        }

      }

    }



    dprintf(fd, "%s", stream.str().c_str());

    dprintf(fd, "%s", stream.str().c_str());

  }

  }

system/btif/src/bluetooth.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <unistd.h>

#include <unistd.h>





#include "bt_utils.h"

#include "bt_utils.h"

#include "bta/include/bta_csis_api.h"

#include "bta/include/bta_hearing_aid_api.h"

#include "bta/include/bta_hearing_aid_api.h"

#include "bta/include/bta_hf_client_api.h"

#include "bta/include/bta_hf_client_api.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif/avrcp/avrcp_service.h"
@@ -400,6 +401,7 @@ static void dump(int fd, const char** arguments) { 
  wakelock_debug_dump(fd);

  wakelock_debug_dump(fd);

  osi_allocator_debug_dump(fd);

  osi_allocator_debug_dump(fd);

  alarm_debug_dump(fd);

  alarm_debug_dump(fd);

  bluetooth::csis::CsisClient::DebugDump(fd);

  HearingAid::DebugDump(fd);

  HearingAid::DebugDump(fd);

  connection_manager::dump(fd);

  connection_manager::dump(fd);

  bluetooth::bqr::DebugDump(fd);

  bluetooth::bqr::DebugDump(fd);

system/test/mock/mock_bta_csis.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,3 +54,4 @@ bool CsisClient::IsCsisClientRunning() { 
void CsisClient::Initialize(CsisClientCallbacks* callbacks, base::Closure initCb) {

void CsisClient::Initialize(CsisClientCallbacks* callbacks, base::Closure initCb) {

  mock_function_count_map[__func__]++;

  mock_function_count_map[__func__]++;

}

}

void CsisClient::DebugDump(int fd) { mock_function_count_map[__func__]++; }