commit 607a0c6d5a2bb18fdf11374a40f5ffedca96d650
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 08 16:33:20 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 08 16:33:20 2020 +0000
tree e0179eaa55c65072a042407fc2166b78850758e1
parent 0bc7c5294bc93815cb33242319ec59c7f62eb2b0
parent 90153a1f6cb6ad66bb10f17906877e6251d738af

Merge "[RESTRICT AUTOMERGE]gpuservice: always dump all in BugReport" into rvc-dev

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) {