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

Commit 0ec91b32 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "bugreport/bugreportz: improve help/errors." am: c066439f 

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

Change-Id: I804612cf2e9c0ef2d94f7e7cc133c120726b803a
parents 1a46ec97 c066439f

cmds/bugreport/bugreport.cpp

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ int main(int argc, char* /*argv*/[]) { 
  fprintf(stderr, "WARNING: Flat (text file, non-zipped) bugreports are deprecated.\n");

  fprintf(stderr, "WARNING: Please generate zipped bugreports instead.\n");

  fprintf(stderr, "WARNING: On the host use: adb bugreport filename.zip\n");

  fprintf(stderr, "WARNING: On the device use: bugreportz filename.zip\n");

  fprintf(stderr, "WARNING: On the device use: bugreportz\n");

  fprintf(stderr, "WARNING: bugreportz will output the filename to use with adb pull.\n");

  fprintf(stderr, "=============================================================================\n\n\n");



  if (argc != 1) {

cmds/bugreportz/main.cpp

+7 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static constexpr char VERSION[] = "1.1"; 


static void show_usage() {

    fprintf(stderr,

            "usage: bugreportz [-h | -v]\n"

            "usage: bugreportz [-hpv]\n"

            "  -h: to display this help message\n"

            "  -p: display progress\n"

            "  -v: to display the version\n"
@@ -64,6 +64,12 @@ int main(int argc, char* argv[]) { 
        }

    }



    // We don't support any non-option arguments.

    if (optind != argc) {

        show_usage();

        return EXIT_FAILURE;

    }



    // TODO: code below was copy-and-pasted from bugreport.cpp (except by the

    // timeout value);

    // should be reused instead.