am f1c78890: am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1 (356b9b87) · Commits · e / os / android_frameworks_base

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

+29 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1248,7 +1248,14 @@ public final class ActivityManagerService extends ActivityManagerNative
	PrintWriter pw = new PrintWriter(sw);		PrintWriter pw = new PrintWriter(sw);
	StringWriter catSw = new StringWriter();		StringWriter catSw = new StringWriter();
	PrintWriter catPw = new PrintWriter(catSw);		PrintWriter catPw = new PrintWriter(catSw);
	dumpApplicationMemoryUsage(null, pw, " ", new String[] { }, true, catPw);		String[] emptyArgs = new String[] { };
			dumpApplicationMemoryUsage(null, pw, " ", emptyArgs, true, catPw);
			pw.println();
			dumpProcessesLocked(null, pw, emptyArgs, 0, false);
			pw.println();
			dumpServicesLocked(null, pw, emptyArgs, 0, false, false);
			pw.println();
			dumpActivitiesLocked(null, pw, emptyArgs, 0, false, false);
	String memUsage = sw.toString();		String memUsage = sw.toString();
	dropBuilder.append('\n');		dropBuilder.append('\n');
	dropBuilder.append(memUsage);		dropBuilder.append(memUsage);
	@@ -8789,6 +8796,20 @@ public final class ActivityManagerService extends ActivityManagerNative
	TimeUtils.formatDuration(r.createTime, nowReal, pw);		TimeUtils.formatDuration(r.createTime, nowReal, pw);
	pw.print(" started="); pw.print(r.startRequested);		pw.print(" started="); pw.print(r.startRequested);
	pw.print(" connections="); pw.println(r.connections.size());		pw.print(" connections="); pw.println(r.connections.size());
			if (r.connections.size() > 0) {
			pw.println(" Connections:");
			for (ArrayList<ConnectionRecord> clist : r.connections.values()) {
			for (int i=0; i<clist.size(); i++) {
			ConnectionRecord conn = clist.get(i);
			pw.print(" ");
			pw.print(conn.binding.intent.intent.getIntent().toShortString(
			false, false, false));
			pw.print(" -> ");
			ProcessRecord proc = conn.binding.client;
			pw.println(proc != null ? proc.toShortString() : "null");
			}
			}
			}
	}		}
	if (dumpClient && r.app != null && r.app.thread != null) {		if (dumpClient && r.app != null && r.app.thread != null) {
	pw.println(" Client:");		pw.println(" Client:");
	@@ -8908,18 +8929,21 @@ public final class ActivityManagerService extends ActivityManagerNative
	continue;		continue;
	}		}
	pw.print(" * "); pw.print(cls); pw.print(" (");		pw.print(" * "); pw.print(cls); pw.print(" (");
	pw.print(comp.flattenToShortString()); pw.print(")");		pw.print(comp.flattenToShortString()); pw.println(")");
	if (dumpAll) {		if (dumpAll) {
	pw.println();
	r.dump(pw, " ");		r.dump(pw, " ");
	} else {		} else {
	pw.print(" * "); pw.print(e.getKey().flattenToShortString());
	if (r.proc != null) {		if (r.proc != null) {
	pw.println(":");
	pw.print(" "); pw.println(r.proc);		pw.print(" "); pw.println(r.proc);
	} else {		} else {
	pw.println();		pw.println();
	}		}
			if (r.clients.size() > 0) {
			pw.println(" Clients:");
			for (ProcessRecord cproc : r.clients) {
			pw.print(" - "); pw.println(cproc);
			}
			}
	}		}
	}		}
	needSep = true;		needSep = true;

services/java/com/android/server/am/ContentProviderRecord.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,10 @@ class ContentProviderRecord extends ContentProviderHolder {
	pw.print(" initOrder="); pw.println(info.initOrder);		pw.print(" initOrder="); pw.println(info.initOrder);
	}		}
	if (clients.size() > 0) {		if (clients.size() > 0) {
			pw.print(prefix); pw.println("Clients:");
			for (ProcessRecord cproc : clients) {
			pw.print(prefix); pw.println(" - "); pw.println(cproc);
			}
	pw.print(prefix); pw.print("clients="); pw.println(clients);		pw.print(prefix); pw.print("clients="); pw.println(clients);
	}		}
	if (externals != 0) {		if (externals != 0) {