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

Commit 8027db1b authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Reduce bug report compression level from 9 to 6." am: 32a79d15 am:... 

Merge "Reduce bug report compression level from 9 to 6." am: 32a79d15 am: 449858ee am: 777bf50f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2089404



Change-Id: I2c340f73772d8664bd5e197df6cebc1ebaf69e3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72ef6b4c 777bf50f

cmds/dumpstate/dumpstate.cpp

+4 −2
Original line number Diff line number Diff line
@@ -829,7 +829,8 @@ status_t Dumpstate::AddZipEntryFromFd(const std::string& entry_name, int fd, 


    // Logging statement  below is useful to time how long each entry takes, but it's too verbose.

    // MYLOGD("Adding zip entry %s\n", entry_name.c_str());

    int32_t err = zip_writer_->StartEntryWithTime(valid_name.c_str(), ZipWriter::kCompress,

    size_t flags = ZipWriter::kCompress | ZipWriter::kDefaultCompression;

    int32_t err = zip_writer_->StartEntryWithTime(valid_name.c_str(), flags,

                                                  get_mtime(fd, ds.now_));

    if (err != 0) {

        MYLOGE("zip_writer_->StartEntryWithTime(%s): %s\n", valid_name.c_str(),
@@ -921,7 +922,8 @@ void Dumpstate::AddDir(const std::string& dir, bool recursive) { 


bool Dumpstate::AddTextZipEntry(const std::string& entry_name, const std::string& content) {

    MYLOGD("Adding zip text entry %s\n", entry_name.c_str());

    int32_t err = zip_writer_->StartEntryWithTime(entry_name.c_str(), ZipWriter::kCompress, ds.now_);

    size_t flags = ZipWriter::kCompress | ZipWriter::kDefaultCompression;

    int32_t err = zip_writer_->StartEntryWithTime(entry_name.c_str(), flags, ds.now_);

    if (err != 0) {

        MYLOGE("zip_writer_->StartEntryWithTime(%s): %s\n", entry_name.c_str(),

               ZipWriter::ErrorCodeString(err));