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

Commit 9fd8c05d authored by Kedar Chitnis's avatar Kedar Chitnis
Browse files

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
parent 38a12996

cmds/dumpstate/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -86,9 +86,11 @@ cc_defaults { 
    shared_libs: [

        "android.hardware.dumpstate@1.0",

        "android.hardware.dumpstate@1.1",

        "android.hardware.dumpstate-V1-ndk",

        "libziparchive",

        "libbase",

        "libbinder",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",

        "libdebuggerd_client",

cmds/dumpstate/DumpstateService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ status_t DumpstateService::dump(int fd, const Vector<String16>&) { 
    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());

cmds/dumpstate/dumpstate.cpp

+240 −87

File changed.

Preview size limit exceeded, changes collapsed.

cmds/dumpstate/dumpstate.h

+5 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <string>

#include <vector>



#include <aidl/android/hardware/dumpstate/IDumpstateDevice.h>

#include <android-base/macros.h>

#include <android-base/unique_fd.h>

#include <android/hardware/dumpstate/1.1/types.h>
@@ -400,19 +401,18 @@ class Dumpstate { 
        bool limited_only = false;

        // Whether progress updates should be published.

        bool do_progress_updates = false;

        // The mode we'll use when calling IDumpstateDevice::dumpstateBoard.

        // this is used to derive dumpstate HAL bug report mode

        // TODO(b/148168577) get rid of the AIDL values, replace them with the HAL values instead.

        // The HAL is actually an API surface that can be validated, while the AIDL is not (@hide).

        ::android::hardware::dumpstate::V1_1::DumpstateMode dumpstate_hal_mode =

            ::android::hardware::dumpstate::V1_1::DumpstateMode::DEFAULT;

        BugreportMode bugreport_mode = Dumpstate::BugreportMode::BUGREPORT_DEFAULT;

        // File descriptor to output zip file. Takes precedence over out_dir.

        android::base::unique_fd bugreport_fd;

        // File descriptor to screenshot file.

        android::base::unique_fd screenshot_fd;

        // Custom output directory.

        std::string out_dir;

        // Bugreport mode of the bugreport.

        std::string bugreport_mode;

        // Bugreport mode of the bugreport as a string

        std::string bugreport_mode_string;

        // Command-line arguments as string

        std::string args;

        // Notification title and description

cmds/dumpstate/tests/dumpstate_test.cpp

+3 −13

File changed.

Preview size limit exceeded, changes collapsed.