frameworks/base/core/res/res/values/config.xml
<string-array translatable="false" name="low_memory_killer_tracker_whitelist" >
<item>"com.xxx.xxx"</item>
</string-array>
frameworks/base/core/res/res/values/symbols.xml
<java-symbol type="array" name="low_memory_killer_tracker_whitelist" />
diff --git a/frameworks/base/services/core/java/com/android/server/am/OomAdjuster.java b/frameworks/base/services/core/java/com/android/server/am/OomAdjuster.java
old mode 100644
new mode 100755
index 225f3bdbf0..60891cbce7
--- a/frameworks/base/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/frameworks/base/services/core/java/com/android/server/am/OomAdjuster.java
@@ -113,7 +113,8 @@ import java.io.PrintWriter;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
+import android.content.res.Resources;
@@ -239,6 +240,7 @@ public final class OomAdjuster {
private final IPlatformCompat mPlatformCompat;
+ private List<String> mLmKillerBypassPackages = new ArrayList<String>();
OomAdjuster(ActivityManagerService service, ProcessList processList, ActiveUids activeUids) {
this(service, processList, activeUids, createAdjusterThread());
}
@@ -303,8 +305,23 @@ public final class OomAdjuster {
/ ProcessList.CACHED_APP_IMPORTANCE_LEVELS;
IBinder b = ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE);
mPlatformCompat = IPlatformCompat.Stub.asInterface(b);
+ String[] lmKillerTrackerWhitelist = Resources.getSystem().getStringArray(
+ com.android.internal.R.array.low_memory_killer_tracker_whitelist);
+ mLmKillerBypassPackages = Arrays.asList(lmKillerTrackerWhitelist);
}
+ private boolean isInWhitelist(ProcessRecord pr) {
+ String pkgName = pr.info.packageName;
+
+ for (String token : mLmKillerBypassPackages) {
+ if (pkgName.startsWith(token)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
void initSettings() {
mCachedAppOptimizer.init();
if (mService.mConstants.KEEP_WARMING_SERVICES.size() > 0) {
@@ -2311,14 +2328,38 @@ public final class OomAdjuster {
}
}
}
- ProcessList.setOomAdj(app.pid, app.uid, app.curAdj);
- if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.info.uid) {
- String msg = "Set " + app.pid + " " + app.processName + " adj "
- + app.curAdj + ": " + app.adjType;
- reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);
+
+
+
+
+
+
+
+
+ boolean isAppWhiteProcess = false;
+ if (isInWhitelist(app) && (app.curAdj > ProcessList.PERSISTENT_SERVICE_ADJ))
+ isAppWhiteProcess = true;
+ if (isAppWhiteProcess) {
+ Slog.d("gongchengzhixing", "isAppWhiteProcess so not kill!");
+ Slog.d(TAG, "isAppWhiteProcess so not kill!");
+ ProcessList.setOomAdj(app.pid, app.uid, ProcessList.PERSISTENT_SERVICE_ADJ);
+ if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.info.uid) {
+ String msg = "Set " + app.pid + " " + app.processName + " adj "
+ + app.curAdj + ": " + app.adjType;
+ reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);
+ }
+ app.setAdj = ProcessList.PERSISTENT_SERVICE_ADJ;
+ app.verifiedAdj = ProcessList.INVALID_ADJ;
+ } else {
+ ProcessList.setOomAdj(app.pid, app.uid, app.curAdj);
+ if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.info.uid) {
+ String msg = "Set " + app.pid + " " + app.processName + " adj "
+ + app.curAdj + ": " + app.adjType;
+ reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);
+ }
+ app.setAdj = app.curAdj;
+ app.verifiedAdj = ProcessList.INVALID_ADJ;
}
- app.setAdj = app.curAdj;
- app.verifiedAdj = ProcessList.INVALID_ADJ;
}
final int curSchedGroup = app.getCurrentSchedulingGroup();