commit f7a23bd97a8ea900f9bf023c57f812855cfbf539
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 26 15:05:09 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 26 15:05:09 2018 +0000
tree 93aadd9f1f7fff6412356b84590811902ddfae69
parent 0bc21a6b52ca5f321c0e9a117e497ca1fd31edd5
parent 1e27b08c1c96926f88c782b047214e09f29d57d2

Merge "Avoid crashing in RunDumpsysProto when not zipping" into pi-dev

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index fd2fccb..bfd0f16 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1159,6 +1159,10 @@
 static void RunDumpsysProto(const std::string& title, int priority,
                             std::chrono::milliseconds timeout,
                             std::chrono::milliseconds service_timeout) {
+    if (!ds.IsZipping()) {
+        MYLOGD("Not dumping %s because it's not a zipped bugreport\n", title.c_str());
+        return;
+    }
     sp<android::IServiceManager> sm = defaultServiceManager();
     Dumpsys dumpsys(sm.get());
     Vector<String16> args;