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

Merge "Update maybe-batching logic."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-20 18:00:04 +00:00
committed by Android (Google) Code Review
parent e27a7f93c8 e7c539f8d7
commit 59c65885d2
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
View File

@@ -1712,6 +1712,12 @@ public class JobSchedulerService extends com.android.server.SystemService
return false;
}
/** Return {@code true} if the specified job is currently executing. */
@GuardedBy("mLock")
public boolean isCurrentlyRunningLocked(JobStatus job) {
return mConcurrencyManager.isJobRunningLocked(job);
}
void noteJobsPending(List<JobStatus> jobs) {
for (int i = jobs.size() - 1; i >= 0; i--) {
JobStatus job = jobs.get(i);
@@ -1719,10 +1725,13 @@ public class JobSchedulerService extends com.android.server.SystemService
}
}
private void noteJobNonPending(JobStatus job) {
mJobPackageTracker.noteNonpending(job);
}
void noteJobsNonpending(List<JobStatus> jobs) {
for (int i = jobs.size() - 1; i >= 0; i--) {
JobStatus job = jobs.get(i);
mJobPackageTracker.noteNonpending(job);
noteJobNonPending(jobs.get(i));
}
}
@@ -2214,14 +2223,19 @@ public class JobSchedulerService extends com.android.server.SystemService
// Functor method invoked for each job via JobStore.forEachJob()
@Override
public void accept(JobStatus job) {
if (isReadyToBeExecutedLocked(job)) {
final boolean isRunning = isCurrentlyRunningLocked(job);
if (isReadyToBeExecutedLocked(job, false)) {
if (mActivityManagerInternal.isAppStartModeDisabled(job.getUid(),
job.getJob().getService().getPackageName())) {
Slog.w(TAG, "Aborting job " + job.getUid() + ":"
+ job.getJob().toString() + " -- package not allowed to start");
mHandler.obtainMessage(MSG_STOP_JOB,
JobParameters.STOP_REASON_BACKGROUND_RESTRICTION, 0, job)
.sendToTarget();
if (isRunning) {
mHandler.obtainMessage(MSG_STOP_JOB,
JobParameters.STOP_REASON_BACKGROUND_RESTRICTION, 0, job)
.sendToTarget();
} else if (mPendingJobs.remove(job)) {
noteJobNonPending(job);
}
return;
}
@@ -2254,7 +2268,9 @@ public class JobSchedulerService extends com.android.server.SystemService
} else {
unbatchedCount++;
}
runnableJobs.add(job);
if (!isRunning) {
runnableJobs.add(job);
}
} else {
evaluateControllerStatesLocked(job);
}

3
services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java
View File

@@ -33,6 +33,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
@@ -705,7 +706,7 @@ public class JobSchedulerServiceTest {
spyOn(mService);
doNothing().when(mService).evaluateControllerStatesLocked(any());
doNothing().when(mService).noteJobsPending(any());
doReturn(true).when(mService).isReadyToBeExecutedLocked(any());
doReturn(true).when(mService).isReadyToBeExecutedLocked(any(), anyBoolean());
advanceElapsedClock(24 * HOUR_IN_MILLIS);
JobSchedulerService.MaybeReadyJobQueueFunctor maybeQueueFunctor =