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

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

Browse Source
This commit is contained in:
Sudheer Shanka
2021-03-26 07:56:19 +00:00
committed by Android (Google) Code Review
parent 655b204a8c 53cea237e4
commit ef688bbdf5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
View File

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

2
core/java/android/content/Context.java
View File

@@ -396,7 +396,7 @@ public abstract class Context {
* *
* @hide * @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 * Flag for {@link #bindService}: allow background foreground service starts from the bound

3
services/core/java/com/android/server/am/OomAdjuster.java
View File

@@ -1997,7 +1997,8 @@ public final class OomAdjuster {
// in this case unless they explicitly request it. // in this case unless they explicitly request it.
if ((cstate.getCurCapability() & PROCESS_CAPABILITY_NETWORK) != 0) { if ((cstate.getCurCapability() & PROCESS_CAPABILITY_NETWORK) != 0) {
if (clientProcState <= PROCESS_STATE_BOUND_FOREGROUND_SERVICE) { 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; capability |= PROCESS_CAPABILITY_NETWORK;
} }
} else { } else {