Merge "Remove one foregrond service restriction." into rvc-dev (af003c10) · Commits · e / os / android_frameworks_base

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -1438,7 +1438,6 @@ public final class OomAdjuster {
		}

		int capabilityFromFGS = 0; // capability from foreground service.
		boolean procStateFromFGSClient = false;
		for (int is = app.services.size() - 1;
		is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
		\|\| schedGroup == ProcessList.SCHED_GROUP_BACKGROUND
		@@ -1561,10 +1560,6 @@ public final class OomAdjuster {
		continue;
		}

		if (clientProcState == PROCESS_STATE_FOREGROUND_SERVICE) {
		procStateFromFGSClient = true;
		}

		if (cr.hasFlag(Context.BIND_INCLUDE_CAPABILITIES)) {
		capability \|= client.curCapability;
		}
		@@ -2012,12 +2007,9 @@ public final class OomAdjuster {
		} else if (!ActivityManager.isProcStateBackground(procState)) {
		// procState higher than PROCESS_STATE_BOUND_FOREGROUND_SERVICE implicitly has
		// camera/microphone capability
		if (procState == PROCESS_STATE_FOREGROUND_SERVICE && procStateFromFGSClient) {
		// if the FGS state is passed down from client, do not grant implicit capabilities.
		} else {
		//TODO: remove this line when enforcing the feature.
		capability \|= PROCESS_CAPABILITY_ALL_IMPLICIT;
		}
		}

		// TOP process has all capabilities.
		if (procState <= PROCESS_STATE_TOP) {