Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48879933 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

Merge commit '390022b2' into froyo-plus-aosp

* commit '390022b2':
  Fix issue #2528537: android.os.DeadObjectException
parents edee621f 390022b2

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

+2 −2
Original line number Diff line number Diff line
@@ -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();