diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-11-26 01:44:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-26 01:44:22 +0000 |
| commit | 4298db73cecf81cd896b0460c69dbaa727b22514 (patch) | |
| tree | 600a278b2d86a30930bb8db98835ee63487243b9 | |
| parent | ee032263046b135045cce0db6dbb8e55cc68baeb (diff) | |
| parent | 824aeab2db793e4d7af9a30f5a38d6ca4d1606bc (diff) | |
| download | frameworks_base-4298db73cecf81cd896b0460c69dbaa727b22514.zip frameworks_base-4298db73cecf81cd896b0460c69dbaa727b22514.tar.gz frameworks_base-4298db73cecf81cd896b0460c69dbaa727b22514.tar.bz2 | |
Merge "Re-tune low memory killer params." into lmp-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index a4aff77..cdc5134 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -177,7 +177,7 @@ final class ProcessList { // 1280x800 or larger screen with around 1GB RAM. Values are in KB. private final int[] mOomMinFreeHigh = new int[] { 73728, 92160, 110592, - 129024, 225000, 325000 + 129024, 147456, 184320 }; // The actual OOM killer memory levels we are using. private final int[] mOomMinFree = new int[mOomAdj.length]; @@ -212,7 +212,7 @@ final class ProcessList { private void updateOomLevels(int displayWidth, int displayHeight, boolean write) { // Scale buckets from avail memory: at 300MB we use the lowest values to // 700MB or more for the top values. - float scaleMem = ((float)(mTotalMemMb-300))/(700-300); + float scaleMem = ((float)(mTotalMemMb-350))/(700-350); // Scale buckets from screen size. int minSize = 480*800; // 384000 @@ -237,8 +237,8 @@ final class ProcessList { if (Build.SUPPORTED_64_BIT_ABIS.length > 0) { // Increase the high min-free levels for cached processes for 64-bit - mOomMinFreeHigh[4] = 225000; - mOomMinFreeHigh[5] = 325000; + mOomMinFreeHigh[4] = (mOomMinFreeHigh[4]*3)/2; + mOomMinFreeHigh[5] = (mOomMinFreeHigh[5]*7)/8; } for (int i=0; i<mOomAdj.length; i++) { |