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

Commit e78c3d7c authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Use screenshot file descriptor if available 

Test: adb shell /data/nativetest64/dumpstate_test/dumpstate_test
BUG: 123576130
Fixes: 123576130

Change-Id: I2ac2dc3bfc7920a00e4148ca29169c171558de3a
parent 2470dd34

cmds/dumpstate/dumpstate.cpp

+10 −3
Original line number Diff line number Diff line
@@ -2475,6 +2475,13 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 
            // bugreport is not shared but made available for manual retrieval.

            return status;

        }

        if (options_->screenshot_fd.get() != -1) {

            bool copy_succeeded = android::os::CopyFileToFd(screenshot_path_,

                                                            options_->screenshot_fd.get());

            if (copy_succeeded) {

                android::os::UnlinkAndLogOnError(screenshot_path_);

            }

        }

    }



    /* vibrate a few but shortly times to let user know it's finished */
@@ -2560,9 +2567,9 @@ Dumpstate::RunStatus Dumpstate::CopyBugreportIfUserConsented() { 
        return HandleUserConsentDenied();

    }

    if (consent_result == UserConsentResult::APPROVED) {

        bool copy_succeeded = android::os::CopyFileToFd(ds.path_, ds.options_->bugreport_fd.get());

        if (copy_succeeded && remove(ds.path_.c_str())) {

            MYLOGE("remove(%s): %s", ds.path_.c_str(), strerror(errno));

        bool copy_succeeded = android::os::CopyFileToFd(path_, options_->bugreport_fd.get());

        if (copy_succeeded) {

            android::os::UnlinkAndLogOnError(path_);

        }

        return copy_succeeded ? Dumpstate::RunStatus::OK : Dumpstate::RunStatus::ERROR;

    } else if (consent_result == UserConsentResult::UNAVAILABLE) {

cmds/dumpstate/dumpstate.h

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ class Dumpstate { 
        // File descriptor to output zip file.

        android::base::unique_fd bugreport_fd;

        // File descriptor to screenshot file.

        // TODO(b/111441001): Use this fd.

        android::base::unique_fd screenshot_fd;

        // TODO: rename to MODE.

        // Extra options passed as system property.