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

Commit 9c8556e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove screenshot_fd as optional param"

parents f9b6eca8 1f3d886c

cmds/dumpstate/DumpstateService.cpp

+5 −5
Original line number Diff line number Diff line
@@ -151,15 +151,15 @@ binder::Status DumpstateService::startBugreport(int32_t calling_uid, 
        signalErrorAndExit(listener, IDumpstateListener::BUGREPORT_ERROR_INVALID_INPUT);

    }



    if (bugreport_fd.get() == -1 || screenshot_fd.get() == -1) {

        // TODO(b/111441001): screenshot fd should be optional

    std::unique_ptr<Dumpstate::DumpOptions> options = std::make_unique<Dumpstate::DumpOptions>();

    options->Initialize(static_cast<Dumpstate::BugreportMode>(bugreport_mode), bugreport_fd,

                        screenshot_fd);



    if (bugreport_fd.get() == -1 || (options->do_fb && screenshot_fd.get() == -1)) {

        MYLOGE("Invalid filedescriptor");

        signalErrorAndExit(listener, IDumpstateListener::BUGREPORT_ERROR_INVALID_INPUT);

    }



    std::unique_ptr<Dumpstate::DumpOptions> options = std::make_unique<Dumpstate::DumpOptions>();

    options->Initialize(static_cast<Dumpstate::BugreportMode>(bugreport_mode), bugreport_fd,

                        screenshot_fd);



    ds_ = &(Dumpstate::GetInstance());

    ds_->SetOptions(std::move(options));

cmds/dumpstate/binder/android/os/IDumpstate.aidl

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ interface IDumpstate { 
     * @param callingUid UID of the original application that requested the report.

     * @param callingPackage package of the original application that requested the report.

     * @param bugreportFd the file to which the zipped bugreport should be written

     * @param screenshotFd the file to which screenshot should be written; optional

     * @param screenshotFd the file to which screenshot should be written

     * @param bugreportMode the mode that specifies other run time options; must be one of above

     * @param listener callback for updates; optional

     */