Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Proper fix for the LRU IndexOutOfBoundsException" into qt-qpr1-dev

Browse Source
This commit is contained in:
Jing Ji
2019-09-10 00:38:16 +00:00
committed by Android (Google) Code Review
parent 4096a80640 6bd77ab542
commit afeaaa3c34
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -2094,10 +2094,10 @@ public final class ProcessList {
} }
} }
} }
if (lrui <= mLruProcessActivityStart) { if (lrui < mLruProcessActivityStart) {
mLruProcessActivityStart--; mLruProcessActivityStart--;
} }
if (lrui <= mLruProcessServiceStart) { if (lrui < mLruProcessServiceStart) {
mLruProcessServiceStart--; mLruProcessServiceStart--;
} }
mLruProcesses.remove(lrui); mLruProcesses.remove(lrui);
@@ -2629,7 +2629,7 @@ public final class ProcessList {
if (!moved) { if (!moved) {
// Goes to the end of the group. // Goes to the end of the group.
mLruProcesses.remove(i); mLruProcesses.remove(i);
mLruProcesses.add(endIndex - 1, subProc); mLruProcesses.add(endIndex, subProc);
if (DEBUG_LRU) Slog.d(TAG_LRU, if (DEBUG_LRU) Slog.d(TAG_LRU,
"Moving " + subProc "Moving " + subProc
+ " from position " + i + " to end of group @ " + " from position " + i + " to end of group @ "
@@ -2874,15 +2874,6 @@ public final class ProcessList {
pos--; pos--;
} }
mLruProcesses.add(pos, app); mLruProcesses.add(pos, app);
if (pos == mLruProcessActivityStart) {
mLruProcessActivityStart++;
}
if (pos == mLruProcessServiceStart) {
// Unless {@code #hasService} is implemented, currently the starting position
// for activity and service are the same, so the incoming position may equal to
// the starting position of service.
mLruProcessServiceStart++;
}
// If this process is part of a group, need to pull up any other processes // If this process is part of a group, need to pull up any other processes
// in that group to be with it. // in that group to be with it.
int endIndex = pos - 1; int endIndex = pos - 1;