Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78ee1021 authored by Riddle Hsu's avatar Riddle Hsu Committed by android-build-merger
Browse files

Merge "Check proto argument in arguments for service" am: 393b4098 am: e8ca9267 

am: 6eab267a

Change-Id: Ifc21d4f698060be5afea5d363822938d89c101d8
parents 5598f518 6eab267a

cmds/dumpsys/dumpsys.cpp

+7 −1
Original line number Diff line number Diff line
@@ -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;

                }

            }

        }

    }