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

Commit 177106d6 authored by Paul Chang's avatar Paul Chang Committed by Android (Google) Code Review
Browse files

Merge "Rename the bugreport from .tmp to .zip when the user consent is unavailable" into sc-dev

parents dd350bb8 ce64421d

cmds/dumpstate/dumpstate.cpp

+5 −0
Original line number Diff line number Diff line
@@ -3187,6 +3187,11 @@ Dumpstate::RunStatus Dumpstate::CopyBugreportIfUserConsented(int32_t calling_uid 
        // Since we do not have user consent to share the bugreport it does not get

        // copied over to the calling app but remains in the internal directory from

        // where the user can manually pull it.

        std::string final_path = GetPath(".zip");

        bool copy_succeeded = android::os::CopyFileToFile(path_, final_path);

        if (copy_succeeded) {

            android::os::UnlinkAndLogOnError(path_);

        }

        return Dumpstate::RunStatus::USER_CONSENT_TIMED_OUT;

    }

    // Unknown result; must be a programming error.