Merge "Clamp the new oom adj to perceptible if the important caller requests" (7ee21abb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/OomAdjuster.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1541,12 +1541,12 @@ public final class OomAdjuster {
		trackedProcState = true;
		}
		} else if ((cr.flags & Context.BIND_NOT_PERCEPTIBLE) != 0
		&& clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ
		&& adj > ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {
		&& clientAdj <= ProcessList.PERCEPTIBLE_APP_ADJ
		&& adj >= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {
		newAdj = ProcessList.PERCEPTIBLE_LOW_APP_ADJ;
		} else if ((cr.flags&Context.BIND_NOT_VISIBLE) != 0
		&& clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ
		&& adj > ProcessList.PERCEPTIBLE_APP_ADJ) {
		&& adj >= ProcessList.PERCEPTIBLE_APP_ADJ) {
		newAdj = ProcessList.PERCEPTIBLE_APP_ADJ;
		} else if (clientAdj >= ProcessList.PERCEPTIBLE_APP_ADJ) {
		newAdj = clientAdj;