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

Merge "Ensure networked UI jobs run during BS & Doze."

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-23 16:40:31 +00:00
committed by Android (Google) Code Review
parent 0a8a91f7ca fe385d6de2
commit fc15fd318c
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,7 +361,14 @@ public final class JobServiceContext implements ServiceConnection {
boolean binding = false;
try {
final int bindFlags;
if (job.shouldTreatAsExpeditedJob()) {
if (job.shouldTreatAsUserInitiatedJob()) {
// TODO (191785864, 261999509): add an appropriate flag so user-initiated jobs
// can bypass data saver
bindFlags = Context.BIND_AUTO_CREATE
| Context.BIND_ALMOST_PERCEPTIBLE
| Context.BIND_BYPASS_POWER_NETWORK_RESTRICTIONS
| Context.BIND_NOT_APP_COMPONENT_USAGE;
} else if (job.shouldTreatAsExpeditedJob()) {
bindFlags = Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND
| Context.BIND_ALMOST_PERCEPTIBLE
| Context.BIND_BYPASS_POWER_NETWORK_RESTRICTIONS

12
apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java
View File

@@ -98,6 +98,13 @@ public final class ConnectivityController extends RestrictingController implemen
~(ConnectivityManager.BLOCKED_REASON_APP_STANDBY
| ConnectivityManager.BLOCKED_REASON_BATTERY_SAVER
| ConnectivityManager.BLOCKED_REASON_DOZE);
// TODO(261999509): allow bypassing data saver & user-restricted. However, when we allow a UI
// job to run while data saver restricts the app, we must ensure that we don't run regular
// jobs when we put a hole in the data saver wall for the UI job
private static final int UNBYPASSABLE_UI_BLOCKED_REASONS =
~(ConnectivityManager.BLOCKED_REASON_APP_STANDBY
| ConnectivityManager.BLOCKED_REASON_BATTERY_SAVER
| ConnectivityManager.BLOCKED_REASON_DOZE);
private static final int UNBYPASSABLE_FOREGROUND_BLOCKED_REASONS =
~(ConnectivityManager.BLOCKED_REASON_APP_STANDBY
| ConnectivityManager.BLOCKED_REASON_BATTERY_SAVER
@@ -1080,6 +1087,11 @@ public final class ConnectivityController extends RestrictingController implemen
Slog.d(TAG, "Using FG bypass for " + jobStatus.getSourceUid());
}
unbypassableBlockedReasons = UNBYPASSABLE_FOREGROUND_BLOCKED_REASONS;
} else if (jobStatus.shouldTreatAsUserInitiatedJob()) {
if (DEBUG) {
Slog.d(TAG, "Using UI bypass for " + jobStatus.getSourceUid());
}
unbypassableBlockedReasons = UNBYPASSABLE_UI_BLOCKED_REASONS;
} else if (jobStatus.shouldTreatAsExpeditedJob() || jobStatus.startedAsExpeditedJob) {
if (DEBUG) {
Slog.d(TAG, "Using EJ bypass for " + jobStatus.getSourceUid());