Merge "Ignore dumpsys -a option" into pi-dev am: eb71027d25

am: e97bef3f20

Change-Id: Ib03affebd96125252893cc13dca05c04f0b715b2

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;
                 }
             }
         }