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

am b591da94: Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev

Browse Source 
* commit 'b591da942e159588c70687dfe3e792feedc8f3b4':
  Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything
This commit is contained in:
Dianne Hackborn
2014-10-03 00:47:04 +00:00
committed by Android Git Automerger
parent 29345d8d21 b591da942e
commit 9ecc07c057
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -166,14 +166,14 @@ final class ProcessList {
// These are the low-end OOM level limits. This is appropriate for an // These are the low-end OOM level limits. This is appropriate for an
// HVGA or smaller phone with less than 512MB. Values are in KB. // HVGA or smaller phone with less than 512MB. Values are in KB.
private final int[] mOomMinFreeLow = new int[] { private final int[] mOomMinFreeLow = new int[] {
8192, 12288, 16384, 12288, 18432, 24576,
24576, 28672, 32768 36864, 43008, 49152
}; };
// These are the high-end OOM level limits. This is appropriate for a // These are the high-end OOM level limits. This is appropriate for a
// 1280x800 or larger screen with around 1GB RAM. Values are in KB. // 1280x800 or larger screen with around 1GB RAM. Values are in KB.
private final int[] mOomMinFreeHigh = new int[] { private final int[] mOomMinFreeHigh = new int[] {
49152, 61440, 73728, 73728, 92160, 110592,
86016, 98304, 122880 129024, 147456, 184320
}; };
// The actual OOM killer memory levels we are using. // The actual OOM killer memory levels we are using.
private final int[] mOomMinFree = new int[mOomAdj.length]; private final int[] mOomMinFree = new int[mOomAdj.length];
@@ -231,7 +231,11 @@ final class ProcessList {
Slog.i("XXXXXX", "minfree_adj=" + minfree_adj + " minfree_abs=" + minfree_abs); Slog.i("XXXXXX", "minfree_adj=" + minfree_adj + " minfree_abs=" + minfree_abs);
} }
final boolean is64bit = Build.SUPPORTED_64_BIT_ABIS.length > 0; // We've now baked in the increase to the basic oom values above, since
// they seem to be useful more generally for devices that are tight on
// memory than just for 64 bit. This should probably have some more
// tuning done, so not deleting it quite yet...
final boolean is64bit = false; //Build.SUPPORTED_64_BIT_ABIS.length > 0;
for (int i=0; i<mOomAdj.length; i++) { for (int i=0; i<mOomAdj.length; i++) {
int low = mOomMinFreeLow[i]; int low = mOomMinFreeLow[i];