commit 773cc03778364097eb2dba212113529e6299dfd3
author Jack Yu <jackyu@google.com> Thu Mar 16 22:43:39 2023 -0700
committer Jack Yu <jackyu@google.com> Thu Mar 16 23:06:56 2023 -0700
tree 938182185ae632a17fbfcea8b5cb9e2ff35311cc
parent 9bf3b2bcd4985d592d84138f05aa31cbb8c0c09f

Added subscriptions dump to connectivity bugreport

The subscription bump has been moved out of TelephonyDebugService
dump because of it has been included in the bugreport through
isub service dump. This caused the regression when collecting
the connectivity dump through BugreportManager.startConnectivityBugreport.

Fixed by adding it DumpstateTelephonyOnly.

Fix: 273805171
Test: atest android.bugreport.cts.BugreportManagerTest#testTelephonyBugreport
      and verified SubscriptionManagerService dump shown in the
      bugreport.
Change-Id: I43269b24f73edabdaff8f6af8aef3a0bda5ad67b

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 21c5bbf..4b1d5da 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -2059,6 +2059,8 @@
                SEC_TO_MSEC(10));
     RunDumpsys("DUMPSYS", {"telephony.registry"}, CommandOptions::WithTimeout(90).Build(),
                SEC_TO_MSEC(10));
+    RunDumpsys("DUMPSYS", {"isub"}, CommandOptions::WithTimeout(90).Build(),
+               SEC_TO_MSEC(10));
     RunDumpsys("DUMPSYS", {"telecom"}, CommandOptions::WithTimeout(90).Build(),
                SEC_TO_MSEC(10));
     if (include_sensitive_info) {