Merge "Improvements on dumpsys activity broadcasts." (79c19d21) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+74 −11

Original line number	Diff line number	Diff line
		@@ -418,6 +418,7 @@ import com.android.server.uri.GrantUri;
		import com.android.server.uri.NeededUriGrants;
		import com.android.server.uri.UriGrantsManagerInternal;
		import com.android.server.utils.PriorityDump;
		import com.android.server.utils.Slogf;
		import com.android.server.utils.TimingsTraceAndSlog;
		import com.android.server.vr.VrManagerInternal;
		import com.android.server.wm.ActivityMetricsLaunchObserver;
		@@ -9470,7 +9471,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		opti++;
		}
		synchronized (this) {
		dumpBroadcastsLocked(fd, pw, args, opti, true, dumpPackage);
		dumpBroadcastsLocked(fd, pw, args, opti, /* dumpAll= */ true, dumpPackage);
		}
		} else if ("broadcast-stats".equals(cmd)) {
		if (opti < args.length) {
		@@ -10409,6 +10410,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		boolean needSep = false;
		boolean onlyHistory = false;
		boolean printedAnything = false;
		boolean onlyReceivers = false;
		int filteredUid = Process.INVALID_UID;

		if ("history".equals(dumpPackage)) {
		if (opti < args.length && "-s".equals(args[opti])) {
		@@ -10417,6 +10420,31 @@ public class ActivityManagerService extends IActivityManager.Stub
		onlyHistory = true;
		dumpPackage = null;
		}
		if ("receivers".equals(dumpPackage)) {
		onlyReceivers = true;
		dumpPackage = null;
		if (opti + 2 <= args.length) {
		for (int i = opti; i < args.length; i++) {
		String arg = args[i];
		switch (arg) {
		case "--uid":
		filteredUid = getIntArg(pw, args, ++i, Process.INVALID_UID);
		if (filteredUid == Process.INVALID_UID) {
		return;
		}
		break;
		default:
		pw.printf("Invalid argument at index %d: %s\n", i, arg);
		return;
		}
		}
		}
		}
		if (DEBUG_BROADCAST) {
		Slogf.d(TAG_BROADCAST, "dumpBroadcastsLocked(): dumpPackage=%s, onlyHistory=%b, "
		+ "onlyReceivers=%b, filteredUid=%d", dumpPackage, onlyHistory, onlyReceivers,
		filteredUid);
		}

		pw.println("ACTIVITY MANAGER BROADCAST STATE (dumpsys activity broadcasts)");
		if (!onlyHistory && dumpAll) {
		@@ -10429,6 +10457,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		!dumpPackage.equals(r.app.info.packageName))) {
		continue;
		}
		if (filteredUid != Process.INVALID_UID && filteredUid != r.app.uid) {
		if (DEBUG_BROADCAST) {
		Slogf.v(TAG_BROADCAST, "dumpBroadcastsLocked(): skipping receiver whose"
		+ " uid (%d) is not %d: %s", r.app.uid, filteredUid, r.app);
		}
		continue;
		}
		if (!printed) {
		pw.println(" Registered Receivers:");
		needSep = true;
		@@ -10438,24 +10473,32 @@ public class ActivityManagerService extends IActivityManager.Stub
		pw.print(" * "); pw.println(r);
		r.dump(pw, " ");
		}
		} else {
		if (onlyReceivers) {
		pw.println(" (no registered receivers)");
		}
		}

		if (mReceiverResolver.dump(pw, needSep ?
		"\n Receiver Resolver Table:" : " Receiver Resolver Table:",
		if (!onlyReceivers) {
		if (mReceiverResolver.dump(pw, needSep
		? "\n Receiver Resolver Table:" : " Receiver Resolver Table:",
		" ", dumpPackage, false, false)) {
		needSep = true;
		printedAnything = true;
		}
		}
		}

		if (!onlyReceivers) {
		for (BroadcastQueue q : mBroadcastQueues) {
		needSep = q.dumpLocked(fd, pw, args, opti, dumpAll, dumpPackage, needSep);
		printedAnything \|= needSep;
		}
		}

		needSep = true;

		if (!onlyHistory && mStickyBroadcasts != null && dumpPackage == null) {
		if (!onlyHistory && !onlyReceivers && mStickyBroadcasts != null && dumpPackage == null) {
		for (int user=0; user<mStickyBroadcasts.size(); user++) {
		if (needSep) {
		pw.println();
		@@ -10490,7 +10533,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		if (!onlyHistory && dumpAll) {
		if (!onlyHistory && !onlyReceivers && dumpAll) {
		pw.println();
		for (BroadcastQueue queue : mBroadcastQueues) {
		pw.println(" mBroadcastsScheduled [" + queue.mQueueName + "]="
		@@ -18381,4 +18424,24 @@ public class ActivityManagerService extends IActivityManager.Stub
		Trace.traceBegin(traceTag, methodName + subInfo);
		}
		}

		/**
		* Gets an {@code int} argument from the given {@code index} on {@code args}, logging an error
		* message on {@code pw} when it cannot be parsed.
		*
		* Returns {@code int} argument or {@code invalidValue} if it could not be parsed.
		*/
		private static int getIntArg(PrintWriter pw, String[] args, int index, int invalidValue) {
		if (index > args.length) {
		pw.println("Missing argument");
		return invalidValue;
		}
		String arg = args[index];
		try {
		return Integer.parseInt(arg);
		} catch (Exception e) {
		pw.printf("Non-numeric argument at index %d: %s\n", index, arg);
		return invalidValue;
		}
		}
		}

services/core/java/com/android/server/am/ReceiverList.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,11 @@ final class ReceiverList extends ArrayList<BroadcastFilter>
		void dumpLocal(PrintWriter pw, String prefix) {
		pw.print(prefix); pw.print("app="); pw.print(app != null ? app.toShortString() : null);
		pw.print(" pid="); pw.print(pid); pw.print(" uid="); pw.print(uid);
		pw.print(" user="); pw.println(userId);
		pw.print(" user="); pw.print(userId);
		if (app != null) {
		pw.print(" #receivers="); pw.print(app.mReceivers.numberOfReceivers());
		}
		pw.println();
		if (curBroadcast != null \|\| linkedToDeath) {
		pw.print(prefix); pw.print("curBroadcast="); pw.print(curBroadcast);
		pw.print(" linkedToDeath="); pw.println(linkedToDeath);