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

Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f44

Browse Source 
Change-Id: I39fd43c52c01b7001f266821806312684bd52163
This commit is contained in:
Jing Ji
2020-05-29 17:58:28 +00:00
committed by Automerger Merge Worker
parent 31e7a3411e e72bd54f44
commit fcf7ca34a0
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1260,9 +1260,11 @@ public final class OomAdjuster {
// value that the caller wants us to. // value that the caller wants us to.
adj = cachedAdj; adj = cachedAdj;
procState = PROCESS_STATE_CACHED_EMPTY; procState = PROCESS_STATE_CACHED_EMPTY;
app.setCached(true); if (!app.containsCycle) {
app.empty = true; app.setCached(true);
app.adjType = "cch-empty"; app.empty = true;
app.adjType = "cch-empty";
}
if (DEBUG_OOM_ADJ_REASON || logUid == appUid) { if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {
reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making empty: " + app); reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making empty: " + app);
} }

9
services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
View File

@@ -1387,6 +1387,15 @@ public class MockingOomAdjusterTests {
SCHED_GROUP_DEFAULT); SCHED_GROUP_DEFAULT);
assertProcStates(app3, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ, assertProcStates(app3, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
SCHED_GROUP_DEFAULT); SCHED_GROUP_DEFAULT);
assertEquals("service", app.adjType);
assertEquals("service", app2.adjType);
assertEquals("fg-service", app3.adjType);
assertEquals(false, app.isCached());
assertEquals(false, app2.isCached());
assertEquals(false, app3.isCached());
assertEquals(false, app.empty);
assertEquals(false, app2.empty);
assertEquals(false, app3.empty);
} }
@SuppressWarnings("GuardedBy") @SuppressWarnings("GuardedBy")