tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "bugreport/bugreportz: improve help/errors." am: c066439f1e am: 0ec91b3266

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

Change-Id: I548d7810266109306bf7744aa237dd80d1dcb216
This commit is contained in:
Elliott Hughes 2020-06-10 21:58:30 +00:00 committed by Automerger Merge Worker
commit 872f2236e4
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmds/bugreport/bugreport.cpp
View file

@ -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) {

8
cmds/bugreportz/main.cpp
View file

@ -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.