commit dcd1f0da541304421648c77db287ebe56339a6be
author Felipe Leme <felipeal@google.com> Thu Aug 04 12:48:50 2016 -0700
committer Felipe Leme <felipeal@google.com> Thu Aug 04 12:51:20 2016 -0700
tree c7eebf127d1b3eeefc2e333837aca3262c1fccd8
parent 8329e4cdecd26488ade74367ab43df85c0290ae8

Fixed logic to print BEGIN: line for bugreportz.

BUG: 30451114
Change-Id: I0e65a38999c128a435b43ad0806e06e6e74580ff

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 0129392..e9f9e57 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1269,17 +1269,19 @@
             add_text_zip_entry("version.txt", version);
         }
 
-        if (do_update_progress && do_broadcast) {
-            // clang-format off
-            std::vector<std::string> am_args = {
-                 "--receiver-permission", "android.permission.DUMP", "--receiver-foreground",
-                 "--es", "android.intent.extra.NAME", suffix,
-                 "--ei", "android.intent.extra.ID", std::to_string(id),
-                 "--ei", "android.intent.extra.PID", std::to_string(getpid()),
-                 "--ei", "android.intent.extra.MAX", std::to_string(WEIGHT_TOTAL),
-            // clang-format on
-            };
-            send_broadcast("android.intent.action.BUGREPORT_STARTED", am_args);
+        if (do_update_progress) {
+            if (do_broadcast) {
+                // clang-format off
+                std::vector<std::string> am_args = {
+                     "--receiver-permission", "android.permission.DUMP", "--receiver-foreground",
+                     "--es", "android.intent.extra.NAME", suffix,
+                     "--ei", "android.intent.extra.ID", std::to_string(id),
+                     "--ei", "android.intent.extra.PID", std::to_string(getpid()),
+                     "--ei", "android.intent.extra.MAX", std::to_string(WEIGHT_TOTAL),
+                };
+                // clang-format on
+                send_broadcast("android.intent.action.BUGREPORT_STARTED", am_args);
+            }
             if (use_control_socket) {
                 dprintf(control_socket_fd, "BEGIN:%s\n", path.c_str());
             }