From c478deb466e01390ca300e3120bab7fdabc08c55 Mon Sep 17 00:00:00 2001
From: Ned Burns <pixel@google.com>
Date: Tue, 29 Oct 2019 20:27:07 -0400
Subject: [PATCH] Don't dump SysUI config if other args are provided

This was polluting the output of selective dump from
adb shell dumpsys activity service com.android.systemui/.SystemUIService dependency DumpController <tag>

Test: manual
Change-Id: Ifcfb97e3edf2005e16a1433862fe9094927c0761
---
 .../src/com/android/systemui/SystemUIService.java      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
index 3f56ff07b24d4..8825f12797961 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
@@ -67,13 +67,11 @@ public class SystemUIService extends Service {
 
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
-        if (args != null && args.length > 0 && args[0].equals("--config")) {
-            dumpConfig(pw);
-            return;
-        }
-
         dumpServices(((SystemUIApplication) getApplication()).getServices(), fd, pw, args);
-        dumpConfig(pw);
+
+        if (args == null || args.length == 0 || args[0].equals("--config")) {
+            dumpConfig(pw);
+        }
     }
 
     static void dumpServices(