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

Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-01-06 17:59:58 +00:00
committed by Android (Google) Code Review
parent 9ffb53cb11 c478cf5185
commit 5fe8197fde
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,15 +235,16 @@ 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);
} }
if (Build.SUPPORTED_64_BIT_ABIS.length > 0) { final boolean is64bit = Build.SUPPORTED_64_BIT_ABIS.length > 0;
// Increase the high min-free levels for cached processes for 64-bit
mOomMinFreeHigh[4] = (mOomMinFreeHigh[4]*3)/2;
mOomMinFreeHigh[5] = (mOomMinFreeHigh[5]*7)/4;
}
for (int i=0; i<mOomAdj.length; i++) { for (int i=0; i<mOomAdj.length; i++) {
int low = mOomMinFreeLow[i]; int low = mOomMinFreeLow[i];
int high = mOomMinFreeHigh[i]; int high = mOomMinFreeHigh[i];
if (is64bit) {
// Increase the high min-free levels for cached processes for 64-bit
if (i == 4) high = (high*3)/2;
else if (i == 5) high = (high*7)/4;
}
mOomMinFree[i] = (int)(low + ((high-low)*scale)); mOomMinFree[i] = (int)(low + ((high-low)*scale));
} }