commit 90153a1f6cb6ad66bb10f17906877e6251d738af
author Yiwei Zhang <zzyiwei@google.com> Sun Jun 07 16:57:10 2020 -0700
committer Yiwei Zhang <zzyiwei@google.com> Sun Jun 07 16:57:10 2020 -0700
tree 2a8d42cca99e6f1b675a6b3d3eee230fd90c84a6
parent 5bcc8f8a38ed372cb7487abc6fbdb1ffb87e1681

[RESTRICT AUTOMERGE]gpuservice: always dump all in BugReport

Bug: 158386226
Test: take a bugreport and verify dumpsys gpu is not empty
Change-Id: Ib2827a72819ef3ccd3267144aaea2e5977f01745

services/gpuservice/GpuService.cpp

diff --git a/services/gpuservice/GpuService.cpp b/services/gpuservice/GpuService.cpp
index 7bb0e4a..f40ce71 100644
--- a/services/gpuservice/GpuService.cpp
+++ b/services/gpuservice/GpuService.cpp
@@ -94,7 +94,6 @@
         size_t numArgs = args.size();
 
         if (numArgs) {
-            dumpAll = false;
             for (size_t index = 0; index < numArgs; ++index) {
                 if (args[index] == String16("--gpustats")) {
                     dumpStats = true;
@@ -102,6 +101,7 @@
                     dumpDriverInfo = true;
                 }
             }
+            dumpAll = !(dumpDriverInfo || dumpStats);
         }
 
         if (dumpAll || dumpDriverInfo) {