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

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

gd_shim: Skip legacy dumpsys if no registrants am: 93eea786 am: cdc3d4bb am: ad5fae0f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I559cb7415e2a58a64e8b85e4ba50094950ea126c
parents 5625c192 ad5fae0f

system/main/shim/dumpsys.cc

+9 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
namespace {

constexpr char kModuleName[] = "shim::legacy::dumpsys";

static std::unordered_map<const void*, bluetooth::shim::DumpsysFunction>*

    dumpsys_functions_;

    dumpsys_functions_{nullptr};

}  // namespace



void bluetooth::shim::RegisterDumpsysFunction(const void* token,
@@ -42,11 +42,15 @@ void bluetooth::shim::UnregisterDumpsysFunction(const void* token) { 
}



void bluetooth::shim::Dump(int fd, const char** args) {

  if (dumpsys_functions_ == nullptr) {

    dprintf(fd, "%s No registered dumpsys shim legacy targets\n", kModuleName);

  } else {

    dprintf(fd, "%s Dumping shim legacy targets:%zd\n", kModuleName,

            dumpsys_functions_->size());

    for (auto& dumpsys : *dumpsys_functions_) {

      dumpsys.second(fd);

    }

  }

  if (bluetooth::shim::is_gd_stack_started_up()) {

    bluetooth::shim::GetDumpsys()->Dump(fd, args);

  } else {