diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-07 00:06:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 00:06:25 +0000 |
| commit | 3e5d6aa04b3336984f28b3168ef95396848cc6de (patch) | |
| tree | 7aae3b275b7369a6c6db88d4fd742423e21315ab | |
| parent | 220b65d21dcb332b9bb39e2c75a5adba5d7c73d9 (diff) | |
| parent | f33d9db43a30299e2dfd3585c0964af953766a09 (diff) | |
| download | frameworks_base-3e5d6aa04b3336984f28b3168ef95396848cc6de.zip frameworks_base-3e5d6aa04b3336984f28b3168ef95396848cc6de.tar.gz frameworks_base-3e5d6aa04b3336984f28b3168ef95396848cc6de.tar.bz2 | |
am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit 'f33d9db43a30299e2dfd3585c0964af953766a09':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 843a0cb..a4aff77 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, 147456, 184320 + 129024, 225000, 325000 }; // The actual OOM killer memory levels we are using. private final int[] mOomMinFree = new int[mOomAdj.length]; |