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

Fix race condition when using mPreserveTopNApps. am: f81d50e255 am: 705b064825

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684473

Change-Id: I4735ad4a3373704d8683db171e9d7e608358ac07
This commit is contained in:
Misha Wagner
2021-09-21 09:26:35 +00:00
committed by Automerger Merge Worker
parent d5d42f7c97 705b064825
commit d14e389f6c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/CacheOomRanker.java
View File

@@ -243,6 +243,7 @@ public class CacheOomRanker {
float lruWeight;
float usesWeight;
float rssWeight;
int preserveTopNApps;
int[] lruPositions;
RankedProcessRecord[] scoredProcessRecords;
@@ -250,6 +251,7 @@ public class CacheOomRanker {
lruWeight = mLruWeight;
usesWeight = mUsesWeight;
rssWeight = mRssWeight;
preserveTopNApps = mPreserveTopNApps;
lruPositions = mLruPositions;
scoredProcessRecords = mScoredProcessRecords;
}
@@ -276,19 +278,19 @@ public class CacheOomRanker {
++numProcessesEvaluated;
}
// Count how many apps we're not re-ranking (up to mPreserveTopNApps).
// Count how many apps we're not re-ranking (up to preserveTopNApps).
int numProcessesNotReRanked = 0;
while (numProcessesEvaluated < lruProcessServiceStart
&& numProcessesNotReRanked < mPreserveTopNApps) {
&& numProcessesNotReRanked < preserveTopNApps) {
ProcessRecord process = lruList.get(numProcessesEvaluated);
if (appCanBeReRanked(process)) {
numProcessesNotReRanked++;
}
numProcessesEvaluated++;
}
// Exclude the top `mPreserveTopNApps` apps from re-ranking.
if (numProcessesNotReRanked < mPreserveTopNApps) {
numProcessesReRanked -= mPreserveTopNApps - numProcessesNotReRanked;
// Exclude the top `preserveTopNApps` apps from re-ranking.
if (numProcessesNotReRanked < preserveTopNApps) {
numProcessesReRanked -= preserveTopNApps - numProcessesNotReRanked;
if (numProcessesReRanked < 0) {
numProcessesReRanked = 0;
}