summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2010-04-07 18:31:06 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-04-07 18:31:06 -0700
commit390022b23b2c53119ff0bde4b14d14728bc48bb2 (patch)
treeb6529ca7527d3bfd9b35f10ebbcd01dc8c62a90f
parentfaa2d970058557fa31d06d168b402d592c368aaf (diff)
parent472ad8716e6fda1350d85cdf0c3028333f3aef41 (diff)
Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 3b655fa7265b..bc26fa0c6ff8 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -1369,7 +1369,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
return;
}
} else {
- procs = service.mLruProcesses;
+ procs = new ArrayList<ProcessRecord>(service.mLruProcesses);
}
}
dumpApplicationMemoryUsage(fd, pw, procs, " ", args);
@@ -10202,7 +10202,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
return numPers;
}
- private static final void dumpApplicationMemoryUsage(FileDescriptor fd,
+ static final void dumpApplicationMemoryUsage(FileDescriptor fd,
PrintWriter pw, List list, String prefix, String[] args) {
final boolean isCheckinRequest = scanArgs(args, "--checkin");
long uptime = SystemClock.uptimeMillis();