Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef688bbd authored Mar 26, 2021 by Sudheer Shanka Committed by Android (Google) Code Review Mar 26, 2021

Merge "Rename Context.BIND_ALLOW_NETWORK_ACCESS." into sc-dev

parents 655b204a 53cea237

apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ public final class JobServiceContext implements ServiceConnection {
		if (job.shouldTreatAsExpeditedJob()) {
		bindFlags = Context.BIND_AUTO_CREATE \| Context.BIND_NOT_FOREGROUND
		\| Context.BIND_ALMOST_PERCEPTIBLE
		\| Context.BIND_ALLOW_NETWORK_ACCESS
		\| Context.BIND_BYPASS_POWER_NETWORK_RESTRICTIONS
		\| Context.BIND_NOT_APP_COMPONENT_USAGE;
		} else {
		bindFlags = Context.BIND_AUTO_CREATE \| Context.BIND_NOT_FOREGROUND

core/java/android/content/Context.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,7 +396,7 @@ public abstract class Context {
		*
		* @hide
		*/
		public static final int BIND_ALLOW_NETWORK_ACCESS = 0x00020000;
		public static final int BIND_BYPASS_POWER_NETWORK_RESTRICTIONS = 0x00020000;

		/**
		* Flag for {@link #bindService}: allow background foreground service starts from the bound

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1997,7 +1997,8 @@ public final class OomAdjuster {
		// in this case unless they explicitly request it.
		if ((cstate.getCurCapability() & PROCESS_CAPABILITY_NETWORK) != 0) {
		if (clientProcState <= PROCESS_STATE_BOUND_FOREGROUND_SERVICE) {
		if ((cr.flags & Context.BIND_ALLOW_NETWORK_ACCESS) != 0) {
		if ((cr.flags & Context.BIND_BYPASS_POWER_NETWORK_RESTRICTIONS)
		!= 0) {
		capability \|= PROCESS_CAPABILITY_NETWORK;
		}
		} else {