Commit c66abb27 authored Sep 27, 2019 by Riddle Hsu

Check proto argument in arguments for service

Commit f5ea44cc adds pid information for non-proto dump.
But the common usage of tests pass the proto argument
for the target service instead of dumpsys, e.g.
 dumpsys activity --proto activities
In this case, asProto is still false that leads to the
pid information in text format is contained in proto dump.

Fix: 141371622
Test: atest DumpsysTest
Test: atest DisplaySizeTest
Change-Id: I6b3fb180985b33e7c97849556f8ba47b4776ca86

parent 0c1abd12

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