commit c504ce1db1d9151af2d21f03031a62162bfea695
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 30 02:46:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 30 02:46:42 2019 +0000
tree 2be34a125d1b32df8866eb12052045e5315b7d90
parent 57344c24c35c6bf593d9d9ef5a6443e040a0a0c5
parent c478deb466e01390ca300e3120bab7fdabc08c55

Merge "Don't dump SysUI config if other args are provided"

packages/SystemUI/src/com/android/systemui/SystemUIService.java

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
index 3f56ff0..8825f12 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
@@ -67,13 +67,11 @@
 
     @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(