Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 390022b2: Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo

Browse Source 
Merge commit '390022b23b2c53119ff0bde4b14d14728bc48bb2' into froyo-plus-aosp

* commit '390022b23b2c53119ff0bde4b14d14728bc48bb2':
  Fix issue #2528537: android.os.DeadObjectException
This commit is contained in:
Dianne Hackborn
2010-04-07 18:33:23 -07:00
committed by Android Git Automerger
parent edee621f5c 390022b23b
commit 4887993381
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1369,7 +1369,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
return; return;
} }
} else { } else {
procs = service.mLruProcesses; procs = new ArrayList<ProcessRecord>(service.mLruProcesses);
} }
} }
dumpApplicationMemoryUsage(fd, pw, procs, " ", args); dumpApplicationMemoryUsage(fd, pw, procs, " ", args);
@@ -10202,7 +10202,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
return numPers; return numPers;
} }
private static final void dumpApplicationMemoryUsage(FileDescriptor fd, static final void dumpApplicationMemoryUsage(FileDescriptor fd,
PrintWriter pw, List list, String prefix, String[] args) { PrintWriter pw, List list, String prefix, String[] args) {
final boolean isCheckinRequest = scanArgs(args, "--checkin"); final boolean isCheckinRequest = scanArgs(args, "--checkin");
long uptime = SystemClock.uptimeMillis(); long uptime = SystemClock.uptimeMillis();