Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909 Change-Id: I657f3737de42d8b0e81017f7f4d8da41b32b8cb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -374,14 +374,12 @@ 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);
|
mUidStates.put(uid, uidState);
|
||||||
mUidStates.put(uid, uidState);
|
|
||||||
}
|
|
||||||
uidState.addProcess(thisProc);
|
|
||||||
}
|
}
|
||||||
|
uidState.addProcess(thisProc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1185,9 +1183,7 @@ 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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user