Merge "Ignore dumpsys -a option" into pi-dev

2018-04-26 18:58:47 +00:00
parent 79b9929f58 32a71128ce
commit eb71027d25
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/BinderCallsStatsService.java
+++ b/services/core/java/com/android/server/BinderCallsStatsService.java
@@ -56,7 +56,10 @@ public class BinderCallsStatsService extends Binder {
    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
        if (args != null) {
            for (final String arg : args) {
-                if ("--reset".equals(arg)) {
+                if ("-a".equals(arg)) {
+                    // We currently dump all information by default
+                    continue;
+                } else if ("--reset".equals(arg)) {
                    reset();
                    pw.println("binder_calls_stats reset.");
                    return;
@@ -78,7 +81,6 @@ public class BinderCallsStatsService extends Binder {
                    return;
                } else {
                    pw.println("Unknown option: " + arg);
-                    return;
                }
            }
        }