Merge "Change format of dump resources log headers and footers" into tm-dev (1c79c05b) · Commits · e / os / android_frameworks_base

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

+4 −12

Original line number	Diff line number	Diff line
		@@ -15623,24 +15623,20 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		for (int i = 0, size = processes.size(); i < size; i++) {
		ProcessRecord app = processes.get(i);
		pw.println(String.format("------ DUMP RESOURCES %s (%s) ------",
		pw.println(String.format("Resources History for %s (%s)",
		app.processName,
		app.info.packageName));
		pw.flush();
		try {
		TransferPipe tp = new TransferPipe();
		TransferPipe tp = new TransferPipe(" ");
		try {
		IApplicationThread thread = app.getThread();
		if (thread != null) {
		app.getThread().dumpResources(tp.getWriteFd(), null);
		tp.go(fd.getFileDescriptor(), 2000);
		pw.println(String.format("------ END DUMP RESOURCES %s (%s) ------",
		app.processName,
		app.info.packageName));
		pw.flush();
		} else {
		pw.println(String.format(
		"------ DUMP RESOURCES %s (%s) failed, no thread ------",
		" Resources history for %s (%s) failed, no thread",
		app.processName,
		app.info.packageName));
		}
		@@ -15648,11 +15644,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		tp.kill();
		}
		} catch (IOException e) {
		pw.println(String.format(
		"------ EXCEPTION DUMPING RESOURCES for %s (%s): %s ------",
		app.processName,
		app.info.packageName,
		e.getMessage()));
		pw.println(" " + e.getMessage());
		pw.flush();
		}