Merge "Check proto argument in arguments for service" am: 393b409881 am: e8ca926713 am: 6eab267a88

am: 78ee10215c

Change-Id: I7dbb13054e30346390a2f4c617345ad2d23de091

1 files changed, 7 insertions, 1 deletions

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index 68b3907102..7646285222 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -201,7 +201,13 @@ int Dumpsys::main(int argc, char* const argv[]) {
             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;
+                }
             }
         }
     }