summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Jeon <kevinjeon@google.com> 2022-05-23 20:12:31 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-05-23 20:12:31 +0000
commit32a79d15620a28adfaf7f1dae26eb166440c5983 (patch)
tree4d2ab08adfea160139b24a12b38f38b17ceaf44b
parentd21420ad06055d6c0c9e86bf76512b729904d34e (diff)
parent9bbe0aca5abd69485edacc23a4be306f313917f1 (diff)
Merge "Reduce bug report compression level from 9 to 6."
-rw-r--r--cmds/dumpstate/dumpstate.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 890c15f895..ccb03599f3 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -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));