commit 8e589c8d9dfa95ade47eebd6aa84368bb6440063
author Dieter Hsu <dieterhsu@google.com> Thu Nov 26 08:23:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 26 08:23:38 2020 +0000
tree 2232d11014c30154196656b01538cc190d5d0e9f
parent f47e91a2955316892ceabc01727992464288e67f
parent 934273dc9da98f7c90dc906a272ee3cb7de8d8b8

Merge "Add stream option to adb bugreport" am: 934273dc9d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/1473639

Change-Id: I70b306e03b431f101aceee67b318ec9c12ea6d36

client/bugreport.cpp

diff --git a/client/bugreport.cpp b/client/bugreport.cpp
index b765a30..1bee2f8 100644
--- a/client/bugreport.cpp
+++ b/client/bugreport.cpp
@@ -199,7 +199,7 @@
 };
 
 int Bugreport::DoIt(int argc, const char** argv) {
-    if (argc > 2) error_exit("usage: adb bugreport [PATH]");
+    if (argc > 2) error_exit("usage: adb bugreport [[PATH] | [--stream]]");
 
     // Gets bugreportz version.
     std::string bugz_stdout, bugz_stderr;
@@ -207,6 +207,7 @@
     int status = SendShellCommand("bugreportz -v", false, &version_callback);
     std::string bugz_version = android::base::Trim(bugz_stderr);
     std::string bugz_output = android::base::Trim(bugz_stdout);
+    int bugz_ver_major = 0, bugz_ver_minor = 0;
 
     if (status != 0 || bugz_version.empty()) {
         D("'bugreportz' -v results: status=%d, stdout='%s', stderr='%s'", status,
@@ -229,6 +230,7 @@
                 bugz_output.c_str(), status);
         return status != 0 ? status : -1;
     }
+    std::sscanf(bugz_version.c_str(), "%d.%d", &bugz_ver_major, &bugz_ver_minor);
 
     std::string dest_file, dest_dir;
 
@@ -238,6 +240,13 @@
             perror("adb: getcwd failed");
             return 1;
         }
+    } else if (!strcmp(argv[1], "--stream")) {
+        if (bugz_ver_major == 1 && bugz_ver_minor < 2) {
+            fprintf(stderr,
+                    "Failed to stream bugreport: bugreportz does not support stream.\n");
+        } else {
+            return SendShellCommand("bugreportz -s", false);
+        }
     } else {
         // Check whether argument is a directory or file
         if (directory_exists(argv[1])) {