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

Commit 76126c62 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am 8e2ab719: am 694a8ef9: am baedbfbb: Merge "[ProcessStas] fix index out of... 

am 8e2ab719: am 694a8ef9: am baedbfbb: Merge "[ProcessStas] fix index out of bounds when add duration."

* commit '8e2ab719':
  [ProcessStas] fix index out of bounds when add duration.
parents 8bf7eecb 8e2ab719

services/core/java/com/android/server/am/ProcessRecord.java

+4 −4
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ final class ProcessRecord { 
                        tracker.getMemFactorLocked(), SystemClock.uptimeMillis(), pkgList);

                origBase.makeInactive();

            }

            baseProcessTracker = tracker.getProcessStateLocked(info.packageName, info.uid,

            baseProcessTracker = tracker.getProcessStateLocked(info.packageName, uid,

                    info.versionCode, processName);

            baseProcessTracker.makeActive();

            for (int i=0; i<pkgList.size(); i++) {
@@ -434,7 +434,7 @@ final class ProcessRecord { 
                if (holder.state != null && holder.state != origBase) {

                    holder.state.makeInactive();

                }

                holder.state = tracker.getProcessStateLocked(pkgList.keyAt(i), info.uid,

                holder.state = tracker.getProcessStateLocked(pkgList.keyAt(i), uid,

                        info.versionCode, processName);

                if (holder.state != baseProcessTracker) {

                    holder.state.makeActive();
@@ -624,7 +624,7 @@ final class ProcessRecord { 
                    versionCode);

            if (baseProcessTracker != null) {

                holder.state = tracker.getProcessStateLocked(

                        pkg, info.uid, versionCode, processName);

                        pkg, uid, versionCode, processName);

                pkgList.put(pkg, holder);

                if (holder.state != baseProcessTracker) {

                    holder.state.makeActive();
@@ -671,7 +671,7 @@ final class ProcessRecord { 
                }

                pkgList.clear();

                ProcessStats.ProcessState ps = tracker.getProcessStateLocked(

                        info.packageName, info.uid, info.versionCode, processName);

                        info.packageName, uid, info.versionCode, processName);

                ProcessStats.ProcessStateHolder holder = new ProcessStats.ProcessStateHolder(

                        info.versionCode);

                holder.state = ps;