commit a6ddb9a9cc1e4a2e59a1d571aa6d9c7de77f4a70
author Steven Moreland <smoreland@google.com> Fri Sep 27 16:41:02 2019 +0000
committer Steven Moreland <smoreland@google.com> Fri Sep 27 16:44:09 2019 +0000
tree a8071fb3b8d3f0dcba4a15d7aaab7c1472919105
parent f5ea44ccc038d29eb953ce504e490528f7d46a30

Revert "Dumpsys also includes service PIDs."

This reverts commit f5ea44ccc038d29eb953ce504e490528f7d46a30.

Reason for revert: Breaking suite/test-mapping-presubmit-retry_cloud-tf
which is expecting a different format.

Fixes: 141728094
Bug: 141187318

Change-Id: Ie71999d3099ec5bf9017f2a2631fb58249d5ca30

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 024a8fd..254e142 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1057,7 +1057,7 @@
         std::string path(title);
         path.append(" - ").append(String8(service).c_str());
         size_t bytes_written = 0;
-        status_t status = dumpsys.startDumpThread(service, /* dumpPid = */ true,  args);
+        status_t status = dumpsys.startDumpThread(service, args);
         if (status == OK) {
             dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority);
             std::chrono::duration<double> elapsed_seconds;
@@ -1129,7 +1129,7 @@
             path.append("_HIGH");
         }
         path.append(kProtoExt);
-        status_t status = dumpsys.startDumpThread(service, /* dumpPid = */ false, args);
+        status_t status = dumpsys.startDumpThread(service, args);
         if (status == OK) {
             status = ds.AddZipEntryFromFd(path, dumpsys.getDumpFd(), service_timeout);
             bool dumpTerminated = (status == OK);