am fa81de9b: Merge "Potential fix for NPE in Running services." into ics-mr1

* commit 'fa81de9b9c561a73216f16b2fd62c6f2042b8090':
  Potential fix for NPE in Running services.
This commit is contained in:
Amith Yamasani
2011-12-02 13:44:15 -08:00
committed by Android Git Automerger

View File

@@ -815,7 +815,7 @@ public class RunningState {
// Build the chains from client processes to the process they are
// dependent on; also remove any old running processes.
int NRP = mRunningProcesses.size();
for (int i=0; i<NRP; i++) {
for (int i = 0; i < NRP;) {
ProcessItem proc = mRunningProcesses.valueAt(i);
if (proc.mRunningSeq == mSequence) {
int clientPid = proc.mRunningProcessInfo.importanceReasonPid;
@@ -833,9 +833,11 @@ public class RunningState {
// we will detect the change.
proc.mClient = null;
}
i++;
} else {
changed = true;
mRunningProcesses.remove(mRunningProcesses.keyAt(i));
NRP--;
}
}