commit 9fd8c05d6d84b57595a63be54d1497d7fdf62e26
author Kedar Chitnis <kedarc@google.com> Tue Nov 16 09:09:22 2021 +0000
committer Kedar Chitnis <kedarc@google.com> Wed Dec 01 06:36:36 2021 +0000
tree 76cc70f2d4532b00603849ba1a4325c7433b0f2b
parent 38a129962a2c2c93fd5c3b31703ecad1e17ddd4c

dumpstate: Call dumpstate HAL HIDL and AIDL APIs

- Call dumpstate HAL AIDL, if found, else call dumpstate HAL
  HIDL APIs since it is expected that in a given device only
  HIDL or AIDL will be implemented
- Remove dumpstate_hal_mode from DumpState::DumpOptions
  and use bugreport_mode since HAL dumpstate mode enum
  can be different in HIDL vs AIDL.

Bug: 205760700
Test: VtsHalDumpstateTargetTest, dumpstate, dumpstate_test, dumpsys
Change-Id: Icd0b79c48c82440f6eac24f057ce28c6620a50bc

cmds/dumpstate/DumpstateService.cpp

diff --git a/cmds/dumpstate/DumpstateService.cpp b/cmds/dumpstate/DumpstateService.cpp
index ba25a5a..77915d5 100644
--- a/cmds/dumpstate/DumpstateService.cpp
+++ b/cmds/dumpstate/DumpstateService.cpp
@@ -192,7 +192,7 @@
     dprintf(fd, "progress:\n");
     ds_->progress_->Dump(fd, "  ");
     dprintf(fd, "args: %s\n", ds_->options_->args.c_str());
-    dprintf(fd, "bugreport_mode: %s\n", ds_->options_->bugreport_mode.c_str());
+    dprintf(fd, "bugreport_mode: %s\n", ds_->options_->bugreport_mode_string.c_str());
     dprintf(fd, "version: %s\n", ds_->version_.c_str());
     dprintf(fd, "bugreport_dir: %s\n", destination.c_str());
     dprintf(fd, "screenshot_path: %s\n", ds_->screenshot_path_.c_str());