Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a

am: 67d9f72659

* commit '67d9f726593d7b7e0cc0c6ba1e4296614e5f67b7':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: Ic44db23ff7792a7d38e430b72f10bfd9ea922630
This commit is contained in:
Jeff Sharkey
2016-06-01 23:42:32 +00:00
committed by android-build-merger

View File

@@ -662,11 +662,13 @@ public final class JobSchedulerService extends com.android.server.SystemService
public void onDeviceIdleStateChanged(boolean deviceIdle) {
synchronized (mLock) {
if (deviceIdle) {
// When becoming idle, make sure no jobs are actively running.
// When becoming idle, make sure no jobs are actively running,
// except those using the idle exemption flag.
for (int i=0; i<mActiveServices.size(); i++) {
JobServiceContext jsc = mActiveServices.get(i);
final JobStatus executing = jsc.getRunningJob();
if (executing != null) {
if (executing != null
&& (executing.getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) == 0) {
jsc.cancelExecutingJob(JobParameters.REASON_DEVICE_IDLE);
}
}