From 90153a1f6cb6ad66bb10f17906877e6251d738af Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@google.com>
Date: Sun, 7 Jun 2020 16:57:10 -0700
Subject: [PATCH] [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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/gpuservice/GpuService.cpp b/services/gpuservice/GpuService.cpp
index 7bb0e4a751..f40ce71bda 100644
--- a/services/gpuservice/GpuService.cpp
+++ b/services/gpuservice/GpuService.cpp
@@ -94,7 +94,6 @@ status_t GpuService::doDump(int fd, const Vector<String16>& args, bool /*asProto
         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 @@ status_t GpuService::doDump(int fd, const Vector<String16>& args, bool /*asProto
                     dumpDriverInfo = true;
                 }
             }
+            dumpAll = !(dumpDriverInfo || dumpStats);
         }
 
         if (dumpAll || dumpDriverInfo) {