Merge "Always dump task with dumpsys activity activities" (d509c56d) · Commits · e / os / android_frameworks_base

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

+21 −16

Original line number	Diff line number	Diff line
		@@ -5062,24 +5062,29 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		}

		boolean dumpActivitiesLocked(FileDescriptor fd, PrintWriter pw, boolean dumpAll,
		boolean dumpClient, String dumpPackage, boolean needSep, String header) {
		boolean printed = false;
		boolean dumpClient, String dumpPackage, boolean needSep) {

		if (mTaskHistory.isEmpty()) {
		return false;
		}
		final String prefix = " ";
		for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
		final TaskRecord task = mTaskHistory.get(taskNdx);
		printed \|= ActivityStackSupervisor.dumpHistoryList(fd, pw,
		mTaskHistory.get(taskNdx).mActivities, " ", "Hist", true, !dumpAll,
		dumpClient, dumpPackage, needSep, header,
		" Task id #" + task.taskId + "\n" +
		" mFullscreen=" + task.mFullscreen + "\n" +
		" mBounds=" + task.mBounds + "\n" +
		" mMinWidth=" + task.mMinWidth + "\n" +
		" mMinHeight=" + task.mMinHeight + "\n" +
		" mLastNonFullscreenBounds=" + task.mLastNonFullscreenBounds);
		if (printed) {
		header = null;
		}
		}
		return printed;
		if (needSep) {
		pw.println("");
		}
		pw.println(prefix + "Task id #" + task.taskId);
		pw.println(prefix + "mFullscreen=" + task.mFullscreen);
		pw.println(prefix + "mBounds=" + task.mBounds);
		pw.println(prefix + "mMinWidth=" + task.mMinWidth);
		pw.println(prefix + "mMinHeight=" + task.mMinHeight);
		pw.println(prefix + "mLastNonFullscreenBounds=" + task.mLastNonFullscreenBounds);
		pw.println(prefix + "* " + task);
		task.dump(pw, prefix + " ");
		ActivityStackSupervisor.dumpHistoryList(fd, pw, mTaskHistory.get(taskNdx).mActivities,
		prefix, "Hist", true, !dumpAll, dumpClient, dumpPackage, false, null, task);
		}
		return true;
		}

		ArrayList<ActivityRecord> getDumpActivitiesLocked(String name) {

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

+12 −28

Original line number	Diff line number	Diff line
		@@ -3644,25 +3644,14 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		ArrayList<ActivityStack> stacks = activityDisplay.mStacks;
		for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
		final ActivityStack stack = stacks.get(stackNdx);
		StringBuilder stackHeader = new StringBuilder(128);
		stackHeader.append(" Stack #");
		stackHeader.append(stack.mStackId);
		stackHeader.append(":");
		stackHeader.append("\n");
		stackHeader.append(" mFullscreen=" + stack.mFullscreen);
		stackHeader.append("\n");
		stackHeader.append(" isSleeping=" + stack.shouldSleepActivities());
		stackHeader.append("\n");
		stackHeader.append(" mBounds=" + stack.mBounds);

		final boolean printedStackHeader = stack.dumpActivitiesLocked(fd, pw, dumpAll,
		dumpClient, dumpPackage, needSep, stackHeader.toString());
		printed \|= printedStackHeader;
		if (!printedStackHeader) {
		// Ensure we always dump the stack header even if there are no activities
		pw.println();
		pw.println(stackHeader);
		}
		pw.println(" Stack #" + stack.mStackId + ":");
		pw.println(" mFullscreen=" + stack.mFullscreen);
		pw.println(" isSleeping=" + stack.shouldSleepActivities());
		pw.println(" mBounds=" + stack.mBounds);

		printed \|= stack.dumpActivitiesLocked(fd, pw, dumpAll, dumpClient, dumpPackage,
		needSep);

		printed \|= dumpHistoryList(fd, pw, stack.mLRUActivities, " ", "Run", false,
		!dumpAll, false, dumpPackage, true,
		@@ -3710,8 +3699,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D

		static boolean dumpHistoryList(FileDescriptor fd, PrintWriter pw, List<ActivityRecord> list,
		String prefix, String label, boolean complete, boolean brief, boolean client,
		String dumpPackage, boolean needNL, String header1, String header2) {
		TaskRecord lastTask = null;
		String dumpPackage, boolean needNL, String header, TaskRecord lastTask) {
		String innerPrefix = null;
		String[] args = null;
		boolean printed = false;
		@@ -3730,13 +3718,9 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		pw.println("");
		needNL = false;
		}
		if (header1 != null) {
		pw.println(header1);
		header1 = null;
		}
		if (header2 != null) {
		pw.println(header2);
		header2 = null;
		if (header != null) {
		pw.println(header);
		header = null;
		}
		if (lastTask != r.getTask()) {
		lastTask = r.getTask();