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

Commit 317e43a1 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev

parents 2bdaacec 22452211

core/java/com/android/internal/app/procstats/ProcessStats.java

+6 −10
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ public final class ProcessStats implements Parcelable { 
                    }

                }

                thisProc.add(otherProc);

                if (thisProc.isActive()) {

                UidState uidState = mUidStates.get(uid);

                if (uidState == null) {

                    uidState = new UidState(this, uid);
@@ -383,7 +382,6 @@ public final class ProcessStats implements Parcelable { 
                uidState.addProcess(thisProc);

            }

        }

        }



        for (int ip = 0, size = mUidStates.size(); ip < size; ip++) {

            mUidStates.valueAt(ip).updateCombinedState(-1);
@@ -1185,11 +1183,9 @@ public final class ProcessStats implements Parcelable { 
                        + " " + proc);

                mProcesses.put(procName, uid, proc);



                if (proc.isActive()) {

                mUidStates.get(uid).addProcess(proc);

            }

        }

        }



        for (int ip = 0; ip < numOfUids; ip++) {

            mUidStates.valueAt(ip).updateCombinedState(-1);