drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ProcessStas] fix index out of bounds when add duration."

Browse Source
This commit is contained in:
Olawale Ogunwale
2015-04-06 15:23:29 +00:00
committed by Gerrit Code Review
parent 1d359daa60 4c5c6f43dd
commit baedbfbbb1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ProcessRecord.java
View File

@ -420,7 +420,7 @@ final class ProcessRecord {
tracker.getMemFactorLocked(), SystemClock.uptimeMillis(), pkgList); tracker.getMemFactorLocked(), SystemClock.uptimeMillis(), pkgList);
origBase.makeInactive(); origBase.makeInactive();
} }
baseProcessTracker = tracker.getProcessStateLocked(info.packageName, info.uid, baseProcessTracker = tracker.getProcessStateLocked(info.packageName, uid,
info.versionCode, processName); info.versionCode, processName);
baseProcessTracker.makeActive(); baseProcessTracker.makeActive();
for (int i=0; i<pkgList.size(); i++) { for (int i=0; i<pkgList.size(); i++) {
@ -428,7 +428,7 @@ final class ProcessRecord {
if (holder.state != null && holder.state != origBase) { if (holder.state != null && holder.state != origBase) {
holder.state.makeInactive(); holder.state.makeInactive();
} }
holder.state = tracker.getProcessStateLocked(pkgList.keyAt(i), info.uid, holder.state = tracker.getProcessStateLocked(pkgList.keyAt(i), uid,
info.versionCode, processName); info.versionCode, processName);
if (holder.state != baseProcessTracker) { if (holder.state != baseProcessTracker) {
holder.state.makeActive(); holder.state.makeActive();
@ -619,7 +619,7 @@ final class ProcessRecord {
versionCode); versionCode);
if (baseProcessTracker != null) { if (baseProcessTracker != null) {
holder.state = tracker.getProcessStateLocked( holder.state = tracker.getProcessStateLocked(
pkg, info.uid, versionCode, processName); pkg, uid, versionCode, processName);
pkgList.put(pkg, holder); pkgList.put(pkg, holder);
if (holder.state != baseProcessTracker) { if (holder.state != baseProcessTracker) {
holder.state.makeActive(); holder.state.makeActive();
@ -666,7 +666,7 @@ final class ProcessRecord {
} }
pkgList.clear(); pkgList.clear();
ProcessStats.ProcessState ps = tracker.getProcessStateLocked( ProcessStats.ProcessState ps = tracker.getProcessStateLocked(
info.packageName, info.uid, info.versionCode, processName); info.packageName, uid, info.versionCode, processName);
ProcessStats.ProcessStateHolder holder = new ProcessStats.ProcessStateHolder( ProcessStats.ProcessStateHolder holder = new ProcessStats.ProcessStateHolder(
info.versionCode); info.versionCode);
holder.state = ps; holder.state = ps;