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

Commit 3e1a66f6 authored by cmanton@google.com's avatar cmanton@google.com Committed by Automerger Merge Worker
Browse files

gdx: Dumpsys should use passed in file descriptor am: 84ef2cb6 

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



Change-Id: I0b47ba170f1e9fe2a33b950b66564fec5a26398a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45319fe7 84ef2cb6

system/gd/shim/dumpsys.cc

+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <sstream>

#include <string>



#include "android_bluetooth_flags.h"

#include "dumpsys/filter.h"

#include "dumpsys_data_generated.h"

#include "module.h"
@@ -138,7 +139,11 @@ void Dumpsys::impl::DumpWithArgsAsync(int fd, const char** args) { 
  ParsedDumpsysArgs parsed_dumpsys_args(args);

  const auto registry = dumpsys_module_.GetModuleRegistry();



  ModuleDumper dumper(STDOUT_FILENO, *registry, kDumpsysTitle);

  int dumper_fd = STDOUT_FILENO;

  if (IS_FLAG_ENABLED(dumpsys_use_passed_in_fd)) {

    dumper_fd = fd;

  }

  ModuleDumper dumper(dumper_fd, *registry, kDumpsysTitle);

  std::string dumpsys_data;

  std::ostringstream oss;

  dumper.DumpState(&dumpsys_data, oss);