Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev
This commit is contained in:
@@ -374,7 +374,6 @@ public final class ProcessStats implements Parcelable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
thisProc.add(otherProc);
|
thisProc.add(otherProc);
|
||||||
if (thisProc.isActive()) {
|
|
||||||
UidState uidState = mUidStates.get(uid);
|
UidState uidState = mUidStates.get(uid);
|
||||||
if (uidState == null) {
|
if (uidState == null) {
|
||||||
uidState = new UidState(this, uid);
|
uidState = new UidState(this, uid);
|
||||||
@@ -383,7 +382,6 @@ public final class ProcessStats implements Parcelable {
|
|||||||
uidState.addProcess(thisProc);
|
uidState.addProcess(thisProc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
for (int ip = 0, size = mUidStates.size(); ip < size; ip++) {
|
for (int ip = 0, size = mUidStates.size(); ip < size; ip++) {
|
||||||
mUidStates.valueAt(ip).updateCombinedState(-1);
|
mUidStates.valueAt(ip).updateCombinedState(-1);
|
||||||
@@ -1185,11 +1183,9 @@ public final class ProcessStats implements Parcelable {
|
|||||||
+ " " + proc);
|
+ " " + proc);
|
||||||
mProcesses.put(procName, uid, proc);
|
mProcesses.put(procName, uid, proc);
|
||||||
|
|
||||||
if (proc.isActive()) {
|
|
||||||
mUidStates.get(uid).addProcess(proc);
|
mUidStates.get(uid).addProcess(proc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
for (int ip = 0; ip < numOfUids; ip++) {
|
for (int ip = 0; ip < numOfUids; ip++) {
|
||||||
mUidStates.valueAt(ip).updateCombinedState(-1);
|
mUidStates.valueAt(ip).updateCombinedState(-1);
|
||||||
|
|||||||
Reference in New Issue
Block a user