commit 393b409881cab0172f44e5b550fa3b5042e175a8
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 27 13:07:47 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 13:07:47 2019 +0000
tree 9fbe8c8b0dbf5172b5a56626fb3d34bad17bdcd4
parent 0c1abd12f9b032e9150a0c12ee40d546cc314bec
parent c66abb27828307448fdb25523f921a07bd91c9a8

Merge "Check proto argument in arguments for service"

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index 68b3907..7646285 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -201,7 +201,13 @@
             if (i == optind) {
                 services.add(String16(argv[i]));
             } else {
-                args.add(String16(argv[i]));
+                const String16 arg(argv[i]);
+                args.add(arg);
+                // For backward compatible, if the proto argument is passed to the service, the
+                // dump request is also considered to use proto.
+                if (!asProto && !arg.compare(String16(PriorityDumper::PROTO_ARG))) {
+                    asProto = true;
+                }
             }
         }
     }