diff options
| author | 2015-04-06 15:23:29 +0000 | |
|---|---|---|
| committer | 2015-04-06 15:23:30 +0000 | |
| commit | baedbfbbb1181829bcffb1be3732b6f26a315bd8 (patch) | |
| tree | ed2d0cacae81375338fe2763cbd15a4d479352b3 | |
| parent | 1d359daa607042417d095aaa83b78befc1b5f8a3 (diff) | |
| parent | 4c5c6f43dd81031c2501e35b355fad5ebbf0ab87 (diff) | |
Merge "[ProcessStas] fix index out of bounds when add duration."
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessRecord.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index b18b05723656..466831a4c51a 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -420,7 +420,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++) { @@ -428,7 +428,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(); @@ -619,7 +619,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(); @@ -666,7 +666,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; |