commit 904e0e0f01e18e2b358f61df158a6beb599a4636
author Abhijeet Kaur <abkaur@google.com> Wed Dec 05 14:03:01 2018 +0000
committer Abhijeet Kaur <abkaur@google.com> Tue Dec 11 16:54:45 2018 +0000
tree 3a6e74c3c298c4d0c244249d2c26dca5210165d2
parent 5f7692f5b2cccb5226985fba22b640042508c82e

Fix adb bugreport and add bugreport unit tests.

Commit 58d72e2 introduced a regression, which made fullbugreport as the
default mode. This lead to 'adb bugreport SAMPLE_BR' triggering a
progress notification on the device as it inherited do_broadcast from full bugreport.

Fix the issue by separating full bugreport from default bugreport.

Add unit tests for all the cases of calling bugreport.

Bug: 119877616
Test: Verified that 'adb bugreport SAMPLE_BR' does not show any notification on the device.
Test: mmm -j frameworks/native/cmds/dumpstate/ && adb push ${OUT}/data/nativetest64/dumpstate_test* /data/nativetest64 && adb shell /data/nativetest64/dumpstate_test/dumpstate_test && printf "\n\n#### ALL TESTS PASSED ####\n"

Change-Id: I06e57454a91a3276dd89d47b3b0a04d3d85f32da

cmds/dumpstate/DumpstateService.cpp

diff --git a/cmds/dumpstate/DumpstateService.cpp b/cmds/dumpstate/DumpstateService.cpp
index 0ee6c3a..d86b9f1 100644
--- a/cmds/dumpstate/DumpstateService.cpp
+++ b/cmds/dumpstate/DumpstateService.cpp
@@ -108,7 +108,8 @@
         bugreport_mode != Dumpstate::BugreportMode::BUGREPORT_REMOTE &&
         bugreport_mode != Dumpstate::BugreportMode::BUGREPORT_WEAR &&
         bugreport_mode != Dumpstate::BugreportMode::BUGREPORT_TELEPHONY &&
-        bugreport_mode != Dumpstate::BugreportMode::BUGREPORT_WIFI) {
+        bugreport_mode != Dumpstate::BugreportMode::BUGREPORT_WIFI &&
+        bugreport_mode != Dumpstate::BugreportMode::BUGREPORT_DEFAULT) {
         return exception(binder::Status::EX_ILLEGAL_ARGUMENT,
                          StringPrintf("Invalid bugreport mode: %d", bugreport_mode));
     }