drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f1c78890: am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1

Browse Source 
* commit 'f1c78890dc703f44227b556e71624bed7eef95a1':
  Improve low memory reporting.
This commit is contained in:
Dianne Hackborn
2011-11-15 11:30:01 -08:00
committed by Android Git Automerger
parent a4db1b7278 f1c78890dc
commit 356b9b87cf
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -1248,7 +1248,14 @@ public final class ActivityManagerService extends ActivityManagerNative
PrintWriter pw = new PrintWriter(sw);
StringWriter catSw = new StringWriter();
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();
dropBuilder.append('\n');
dropBuilder.append(memUsage);
@ -8789,6 +8796,20 @@ public final class ActivityManagerService extends ActivityManagerNative
TimeUtils.formatDuration(r.createTime, nowReal, pw);
pw.print(" started="); pw.print(r.startRequested);
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) {
pw.println(" Client:");
@ -8908,18 +8929,21 @@ public final class ActivityManagerService extends ActivityManagerNative
continue;
}
pw.print(" * "); pw.print(cls); pw.print(" (");
pw.print(comp.flattenToShortString()); pw.print(")");
pw.print(comp.flattenToShortString()); pw.println(")");
if (dumpAll) {
pw.println();
r.dump(pw, " ");
} else {
pw.print(" * "); pw.print(e.getKey().flattenToShortString());
if (r.proc != null) {
pw.println(":");
pw.print(" "); pw.println(r.proc);
} else {
pw.println();
}
if (r.clients.size() > 0) {
pw.println(" Clients:");
for (ProcessRecord cproc : r.clients) {
pw.print(" - "); pw.println(cproc);
}
}
}
}
needSep = true;

4
services/java/com/android/server/am/ContentProviderRecord.java
View File

@ -74,6 +74,10 @@ class ContentProviderRecord extends ContentProviderHolder {
pw.print(" initOrder="); pw.println(info.initOrder);
}
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);
}
if (externals != 0) {