commit a54014b417733f9870e160847f3b80cfb386533b
author Devin Moore <devinmoore@google.com> Mon Mar 13 18:29:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 13 18:29:50 2023 +0000
tree 1123c8f25d762b26bbdb8d335ad3ed6cdfbcea88
parent 2be30b5a1ec76744fa551c9bd3bd6e573e5677e9
parent 595cc8ad3239b17128326682a5a692aa9f9e26bf

Merge "Get service PID from dumpsys in bugreports" am: 19ce0cba3e am: c2f6b4f403 am: 595cc8ad32

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

Change-Id: I0ca229ddec1d9c3f316d8ea5b8b485786cd3a3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 788ff03..6f84e7c 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1254,8 +1254,9 @@
              dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority);
              dumpsys.writeDumpFooter(STDOUT_FILENO, service, std::chrono::milliseconds(1));
         } else {
-            status_t status = dumpsys.startDumpThread(Dumpsys::TYPE_DUMP, service, args);
-            if (status == OK) {
+             status_t status = dumpsys.startDumpThread(Dumpsys::TYPE_DUMP | Dumpsys::TYPE_PID,
+                                                       service, args);
+             if (status == OK) {
                 dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority);
                 std::chrono::duration<double> elapsed_seconds;
                 if (priority == IServiceManager::DUMP_FLAG_PRIORITY_HIGH &&