summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2019-02-15 17:01:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-15 17:01:31 +0000
commitb68b8a84831d480c1c254dcb271f0f31f95f315f (patch)
treeb05203d796cb787c050541e1102b33f29f9ef099
parent06d74157c8ad5f42bf629db586e7ad2de37326dc (diff)
parent20004917e187d43f091d2914cbd9aff7cf815b65 (diff)
Merge "compaction: tweak full compaction again"
-rw-r--r--services/core/java/com/android/server/am/OomAdjuster.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 93a71e5a2ed4..4e03b72e6ce6 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -1692,7 +1692,8 @@ public final class OomAdjuster {
(app.curAdj == ProcessList.PREVIOUS_APP_ADJ ||
app.curAdj == ProcessList.HOME_APP_ADJ)) {
mAppCompact.compactAppSome(app);
- } else if (app.setAdj < ProcessList.CACHED_APP_MIN_ADJ
+ } else if ((app.setAdj < ProcessList.CACHED_APP_MIN_ADJ
+ || app.setAdj > ProcessList.CACHED_APP_MAX_ADJ)
&& app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ
&& app.curAdj <= ProcessList.CACHED_APP_MAX_ADJ) {
mAppCompact.compactAppFull(app);