From 819087f4a9a10af9fbe86f3aeae27aedd5caf446 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Mon, 31 Oct 2022 17:05:50 +0000 Subject: [PATCH] Remove unused parameter and innocuous bug. 1. Remove the forUpdate boolean since no controller was using it. 2. Stop returning a boolean from JobStore.add(). It was always returning false because the remove() method would remove the added JobStatus object, not anything similar to the object. Thankfully, we were removing old JobStatus objects via another codepath, so the bug never surfaced as an issue. Bug: 141645789 Test: Android builds Change-Id: I17c7a4a629f033c574e4fbd625211c0fc476fcc9 --- .../server/job/JobSchedulerService.java | 7 +- .../java/com/android/server/job/JobStore.java | 10 +- .../controllers/BackgroundJobsController.java | 3 +- .../job/controllers/BatteryController.java | 4 +- .../job/controllers/ComponentController.java | 3 +- .../controllers/ConnectivityController.java | 3 +- .../ContentObserverController.java | 3 +- .../controllers/DeviceIdleJobsController.java | 3 +- .../controllers/FlexibilityController.java | 2 +- .../job/controllers/IdleController.java | 5 +- .../job/controllers/PrefetchController.java | 3 +- .../job/controllers/QuotaController.java | 3 +- .../job/controllers/StateController.java | 3 +- .../job/controllers/StorageController.java | 3 +- .../job/controllers/TareController.java | 3 +- .../job/controllers/TimeController.java | 5 +- .../controllers/BatteryControllerTest.java | 8 +- .../job/controllers/QuotaControllerTest.java | 204 +++++++++--------- .../job/controllers/StateControllerTest.java | 3 +- 19 files changed, 132 insertions(+), 146 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 6375d0deae40f..d670a83a0b2bc 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -1820,12 +1820,13 @@ public class JobSchedulerService extends com.android.server.SystemService Slog.wtf(TAG, "Not yet prepared when started tracking: " + jobStatus); } jobStatus.enqueueTime = sElapsedRealtimeClock.millis(); - final boolean update = mJobs.add(jobStatus); + final boolean update = lastJob != null; + mJobs.add(jobStatus); if (mReadyToRock) { for (int i = 0; i < mControllers.size(); i++) { StateController controller = mControllers.get(i); if (update) { - controller.maybeStopTrackingJobLocked(jobStatus, null, true); + controller.maybeStopTrackingJobLocked(jobStatus, null); } controller.maybeStartTrackingJobLocked(jobStatus, lastJob); } @@ -1858,7 +1859,7 @@ public class JobSchedulerService extends com.android.server.SystemService if (mReadyToRock) { for (int i = 0; i < mControllers.size(); i++) { StateController controller = mControllers.get(i); - controller.maybeStopTrackingJobLocked(jobStatus, incomingJob, false); + controller.maybeStopTrackingJobLocked(jobStatus, incomingJob); } } return removed; diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java index 22b09683187f5..4673605c6f98f 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java @@ -203,13 +203,12 @@ public final class JobStore { } /** - * Add a job to the master list, persisting it if necessary. If the JobStatus already exists, - * it will be replaced. + * Add a job to the master list, persisting it if necessary. + * Similar jobs to the new job will not be removed. + * * @param jobStatus Job to add. - * @return Whether or not an equivalent JobStatus was replaced by this operation. */ - public boolean add(JobStatus jobStatus) { - boolean replaced = mJobSet.remove(jobStatus); + public void add(JobStatus jobStatus) { mJobSet.add(jobStatus); if (jobStatus.isPersisted()) { maybeWriteStatusToDiskAsync(); @@ -217,7 +216,6 @@ public final class JobStore { if (DEBUG) { Slog.d(TAG, "Added job status to store: " + jobStatus); } - return replaced; } /** diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java index 65d712102e948..ecee10a13c1d8 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/BackgroundJobsController.java @@ -81,8 +81,7 @@ public final class BackgroundJobsController extends StateController { } @Override - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { } @Override diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java index d284a99a45590..2ca3f8f731e92 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/BatteryController.java @@ -133,7 +133,7 @@ public final class BatteryController extends RestrictingController { } @Override - public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob, boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob) { if (taskStatus.clearTrackingController(JobStatus.TRACKING_BATTERY)) { mTrackedTasks.remove(taskStatus); mTopStartedJobs.remove(taskStatus); @@ -143,7 +143,7 @@ public final class BatteryController extends RestrictingController { @Override public void stopTrackingRestrictedJobLocked(JobStatus jobStatus) { if (!jobStatus.hasPowerConstraint()) { - maybeStopTrackingJobLocked(jobStatus, null, false); + maybeStopTrackingJobLocked(jobStatus, null); } } diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java index 9b5956094e481..b029e0075dc26 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java @@ -127,8 +127,7 @@ public class ComponentController extends StateController { } @Override - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { } @Override diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java index d2dc2a7e4e960..16dd16727fa6e 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java @@ -290,8 +290,7 @@ public final class ConnectivityController extends RestrictingController implemen @GuardedBy("mLock") @Override - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { if (jobStatus.clearTrackingController(JobStatus.TRACKING_CONNECTIVITY)) { ArraySet jobs = mTrackedJobs.get(jobStatus.getSourceUid()); if (jobs != null) { diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/ContentObserverController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/ContentObserverController.java index 83a756cf1e11e..847a1bfe44650 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/ContentObserverController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/ContentObserverController.java @@ -159,8 +159,7 @@ public final class ContentObserverController extends StateController { } @Override - public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob) { if (taskStatus.clearTrackingController(JobStatus.TRACKING_CONTENT)) { mTrackedTasks.remove(taskStatus); if (taskStatus.contentObserverJobInstance != null) { diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java index abbe177c5d493..bdf72b64d3e0f 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java @@ -225,8 +225,7 @@ public final class DeviceIdleJobsController extends StateController { } @Override - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { if ((jobStatus.getFlags()&JobInfo.FLAG_IMPORTANT_WHILE_FOREGROUND) != 0) { mAllowInIdleJobs.remove(jobStatus); } diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java index 547f94badd69a..0eef5b9894b8f 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java @@ -213,7 +213,7 @@ public final class FlexibilityController extends StateController { @Override @GuardedBy("mLock") - public void maybeStopTrackingJobLocked(JobStatus js, JobStatus incomingJob, boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus js, JobStatus incomingJob) { if (js.clearTrackingController(JobStatus.TRACKING_FLEXIBILITY)) { mFlexibilityAlarmQueue.removeAlarmForKey(js); mFlexibilityTracker.remove(js); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/IdleController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/IdleController.java index 926cfc192cd13..a25af7110ee55 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/IdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/IdleController.java @@ -76,8 +76,7 @@ public final class IdleController extends RestrictingController implements Idlen } @Override - public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob) { if (taskStatus.clearTrackingController(JobStatus.TRACKING_IDLE)) { mTrackedTasks.remove(taskStatus); } @@ -86,7 +85,7 @@ public final class IdleController extends RestrictingController implements Idlen @Override public void stopTrackingRestrictedJobLocked(JobStatus jobStatus) { if (!jobStatus.hasIdleConstraint()) { - maybeStopTrackingJobLocked(jobStatus, null, false); + maybeStopTrackingJobLocked(jobStatus, null); } } diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/PrefetchController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/PrefetchController.java index e04cec30d26b2..d69b9e084c2b4 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/PrefetchController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/PrefetchController.java @@ -167,8 +167,7 @@ public class PrefetchController extends StateController { @Override @GuardedBy("mLock") - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { final int userId = jobStatus.getSourceUserId(); final String pkgName = jobStatus.getSourcePackageName(); final ArraySet jobs = mTrackedJobs.get(userId, pkgName); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java index bb8d175c2375b..659e7c0fde84e 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java @@ -673,8 +673,7 @@ public final class QuotaController extends StateController { @Override @GuardedBy("mLock") - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { if (jobStatus.clearTrackingController(JobStatus.TRACKING_QUOTA)) { unprepareFromExecutionLocked(jobStatus); final int userId = jobStatus.getSourceUserId(); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/StateController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/StateController.java index 8453e53782ca0..0eedcf0bfe773 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/StateController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/StateController.java @@ -85,8 +85,7 @@ public abstract class StateController { /** * Remove task - this will happen if the task is cancelled, completed, etc. */ - public abstract void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate); + public abstract void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob); /** * Called when a new job is being created to reschedule an old failed job. diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/StorageController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/StorageController.java index 1ce0a7f6b4c7f..11e2ff7bd77f8 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/StorageController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/StorageController.java @@ -70,8 +70,7 @@ public final class StorageController extends StateController { } @Override - public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus taskStatus, JobStatus incomingJob) { if (taskStatus.clearTrackingController(JobStatus.TRACKING_STORAGE)) { mTrackedTasks.remove(taskStatus); } diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/TareController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/TareController.java index b2ca3a051e360..cafb02dd7531b 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/TareController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/TareController.java @@ -383,8 +383,7 @@ public class TareController extends StateController { @Override @GuardedBy("mLock") - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { final int userId = jobStatus.getSourceUserId(); final String pkgName = jobStatus.getSourcePackageName(); if (!mTopStartedJobs.remove(jobStatus) && jobStatus.madeActive > 0) { diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java index b6361ce565699..5195f28de9d2e 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java @@ -79,7 +79,7 @@ public final class TimeController extends StateController { @Override public void maybeStartTrackingJobLocked(JobStatus job, JobStatus lastJob) { if (job.hasTimingDelayConstraint() || job.hasDeadlineConstraint()) { - maybeStopTrackingJobLocked(job, null, false); + maybeStopTrackingJobLocked(job, null); // First: check the constraints now, because if they are already satisfied // then there is no need to track it. This gives us a fast path for a common @@ -134,8 +134,7 @@ public final class TimeController extends StateController { * tracking was the one our alarms were based off of. */ @Override - public void maybeStopTrackingJobLocked(JobStatus job, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus job, JobStatus incomingJob) { if (job.clearTrackingController(JobStatus.TRACKING_TIME)) { if (mTrackedJobs.remove(job)) { checkExpiredDelaysAndResetAlarm(); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/BatteryControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/BatteryControllerTest.java index 59cb43f16ef66..7c435be5ebdd5 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/BatteryControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/BatteryControllerTest.java @@ -432,10 +432,10 @@ public class BatteryControllerTest { assertFalse(topStartedJobs.contains(unrelatedJob)); // Job cleanup - mBatteryController.maybeStopTrackingJobLocked(batteryJob, null, false); - mBatteryController.maybeStopTrackingJobLocked(chargingJob, null, false); - mBatteryController.maybeStopTrackingJobLocked(bothPowerJob, null, false); - mBatteryController.maybeStopTrackingJobLocked(unrelatedJob, null, false); + mBatteryController.maybeStopTrackingJobLocked(batteryJob, null); + mBatteryController.maybeStopTrackingJobLocked(chargingJob, null); + mBatteryController.maybeStopTrackingJobLocked(bothPowerJob, null); + mBatteryController.maybeStopTrackingJobLocked(unrelatedJob, null); assertFalse(trackedJobs.contains(batteryJob)); assertFalse(trackedJobs.contains(chargingJob)); assertFalse(trackedJobs.contains(bothPowerJob)); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java index 9407968dbb567..6ba2e0d2d493c 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java @@ -1356,7 +1356,7 @@ public class QuotaControllerTest { synchronized (mQuotaController.mLock) { assertEquals(JobSchedulerService.Constants.DEFAULT_RUNTIME_FREE_QUOTA_MAX_LIMIT_MS, mQuotaController.getMaxJobExecutionTimeMsLocked((job))); - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } setProcessState(ActivityManager.PROCESS_STATE_RECEIVER); @@ -1441,7 +1441,7 @@ public class QuotaControllerTest { synchronized (mQuotaController.mLock) { assertEquals(mQcConstants.EJ_LIMIT_ACTIVE_MS / 2, mQuotaController.getMaxJobExecutionTimeMsLocked(job)); - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } setProcessState(ActivityManager.PROCESS_STATE_RECEIVER); @@ -1474,7 +1474,7 @@ public class QuotaControllerTest { synchronized (mQuotaController.mLock) { assertEquals(mQcConstants.EJ_LIMIT_ACTIVE_MS / 2, mQuotaController.getMaxJobExecutionTimeMsLocked(job)); - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } setProcessState(ActivityManager.PROCESS_STATE_RECEIVER); @@ -2017,7 +2017,7 @@ public class QuotaControllerTest { setProcessState(ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND); } synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } advanceElapsedClock(15 * SECOND_IN_MILLIS); @@ -2032,7 +2032,7 @@ public class QuotaControllerTest { setProcessState(ActivityManager.PROCESS_STATE_RECEIVER); } synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } advanceElapsedClock(10 * MINUTE_IN_MILLIS + 30 * SECOND_IN_MILLIS); @@ -2090,7 +2090,7 @@ public class QuotaControllerTest { setProcessState(ActivityManager.PROCESS_STATE_TOP_SLEEPING, fgChangerUid); } synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(fgStateChanger, null, false); + mQuotaController.maybeStopTrackingJobLocked(fgStateChanger, null); } advanceElapsedClock(15 * SECOND_IN_MILLIS); @@ -2105,9 +2105,9 @@ public class QuotaControllerTest { setProcessState(ActivityManager.PROCESS_STATE_TOP_SLEEPING, fgChangerUid); } synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(fgStateChanger, null, false); + mQuotaController.maybeStopTrackingJobLocked(fgStateChanger, null); - mQuotaController.maybeStopTrackingJobLocked(unaffected, null, false); + mQuotaController.maybeStopTrackingJobLocked(unaffected, null); assertTrue(mQuotaController.isWithinQuotaLocked(unaffected)); assertTrue(unaffected.isReady()); @@ -2226,8 +2226,8 @@ public class QuotaControllerTest { advanceElapsedClock(MINUTE_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job1, null, false); - mQuotaController.maybeStopTrackingJobLocked(job2, null, false); + mQuotaController.maybeStopTrackingJobLocked(job1, null); + mQuotaController.maybeStopTrackingJobLocked(job2, null); assertFalse(mQuotaController .isWithinQuotaLocked(SOURCE_USER_ID, SOURCE_PACKAGE, WORKING_INDEX)); assertEquals(7 * MINUTE_IN_MILLIS, stats.allowedTimePerPeriodMs); @@ -2312,8 +2312,8 @@ public class QuotaControllerTest { advanceElapsedClock(MINUTE_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job1, null, false); - mQuotaController.maybeStopTrackingJobLocked(job2, null, false); + mQuotaController.maybeStopTrackingJobLocked(job1, null); + mQuotaController.maybeStopTrackingJobLocked(job2, null); assertFalse(mQuotaController .isWithinQuotaLocked(SOURCE_USER_ID, SOURCE_PACKAGE, WORKING_INDEX)); assertEquals(12, stats.jobCountLimit); @@ -2390,7 +2390,7 @@ public class QuotaControllerTest { advanceElapsedClock(MINUTE_IN_MILLIS); mAppIdleStateChangeListener.triggerTemporaryQuotaBump(SOURCE_PACKAGE, SOURCE_USER_ID); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job1, null, false); + mQuotaController.maybeStopTrackingJobLocked(job1, null); assertTrue(mQuotaController .isWithinQuotaLocked(SOURCE_USER_ID, SOURCE_PACKAGE, WORKING_INDEX)); assertEquals(4, stats.sessionCountLimit); @@ -2404,7 +2404,7 @@ public class QuotaControllerTest { advanceElapsedClock(MINUTE_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job2, null, false); + mQuotaController.maybeStopTrackingJobLocked(job2, null); assertFalse(mQuotaController .isWithinQuotaLocked(SOURCE_USER_ID, SOURCE_PACKAGE, WORKING_INDEX)); assertEquals(4, stats.sessionCountLimit); @@ -3711,7 +3711,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } assertNull(mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); } @@ -3737,7 +3737,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } expected.add(createTimingSession(start, 5 * SECOND_IN_MILLIS, 1)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -3766,7 +3766,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { @@ -3774,11 +3774,11 @@ public class QuotaControllerTest { } advanceElapsedClock(20 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } expected.add(createTimingSession(start, MINUTE_IN_MILLIS, 3)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -3819,7 +3819,7 @@ public class QuotaControllerTest { long start = JobSchedulerService.sElapsedRealtimeClock.millis(); advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, jobStatus, true); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, jobStatus); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -3850,18 +3850,18 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); setDischarging(); start = JobSchedulerService.sElapsedRealtimeClock.millis(); advanceElapsedClock(20 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } expected.add(createTimingSession(start, 20 * SECOND_IN_MILLIS, 1)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -3879,7 +3879,7 @@ public class QuotaControllerTest { setCharging(); advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); } @@ -3905,7 +3905,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } expected.add(createTimingSession(start, 5 * SECOND_IN_MILLIS, 1)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -3934,7 +3934,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { @@ -3942,11 +3942,11 @@ public class QuotaControllerTest { } advanceElapsedClock(20 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } expected.add(createTimingSession(start, MINUTE_IN_MILLIS, 3)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -3973,7 +3973,7 @@ public class QuotaControllerTest { setProcessState(ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE); advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } assertNull(mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); } @@ -4005,7 +4005,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4030,11 +4030,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobFg3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobFg3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4063,7 +4063,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } advanceElapsedClock(10 * SECOND_IN_MILLIS); // UID "inactive" now start = JobSchedulerService.sElapsedRealtimeClock.millis(); @@ -4073,11 +4073,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobFg3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobFg3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } expected.add(createTimingSession(start, 20 * SECOND_IN_MILLIS, 2)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4116,11 +4116,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobFg1, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobFg1, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobFg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobFg2, null); } assertNull(mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4155,11 +4155,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } assertEquals(2, stats.jobCountInRateLimitingWindow); @@ -4193,7 +4193,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4218,11 +4218,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobTop, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobTop, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4253,7 +4253,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } advanceElapsedClock(5 * SECOND_IN_MILLIS); setProcessState(ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE); @@ -4270,12 +4270,12 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobTop, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobTop, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); - mQuotaController.maybeStopTrackingJobLocked(jobFg1, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); + mQuotaController.maybeStopTrackingJobLocked(jobFg1, null); } expected.add(createTimingSession(start, 20 * SECOND_IN_MILLIS, 2)); assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4312,7 +4312,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job1, job1, true); + mQuotaController.maybeStopTrackingJobLocked(job1, job1); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -4329,7 +4329,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job2, null, false); + mQuotaController.maybeStopTrackingJobLocked(job2, null); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -4348,7 +4348,7 @@ public class QuotaControllerTest { long elapsedGracePeriodMs = 2 * SECOND_IN_MILLIS; advanceElapsedClock(elapsedGracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job3, null, false); + mQuotaController.maybeStopTrackingJobLocked(job3, null); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS + elapsedGracePeriodMs, 1)); assertEquals(expected, @@ -4373,7 +4373,7 @@ public class QuotaControllerTest { advanceElapsedClock(10 * SECOND_IN_MILLIS); expected.add(createTimingSession(start, remainingGracePeriod + 10 * SECOND_IN_MILLIS, 1)); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job4, job4, true); + mQuotaController.maybeStopTrackingJobLocked(job4, job4); } assertEquals(expected, mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -4387,7 +4387,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job5, job5, true); + mQuotaController.maybeStopTrackingJobLocked(job5, job5); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -4624,7 +4624,7 @@ public class QuotaControllerTest { } advanceElapsedClock(SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } advanceElapsedClock(SECOND_IN_MILLIS); } @@ -4695,7 +4695,7 @@ public class QuotaControllerTest { } advanceElapsedClock(SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } advanceElapsedClock(SECOND_IN_MILLIS); } @@ -5408,7 +5408,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } assertNull(mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); } @@ -5434,7 +5434,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } expected.add(createTimingSession(start, 5 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5464,7 +5464,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { @@ -5472,11 +5472,11 @@ public class QuotaControllerTest { } advanceElapsedClock(20 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } expected.add(createTimingSession(start, MINUTE_IN_MILLIS, 3)); assertEquals(expected, @@ -5521,7 +5521,7 @@ public class QuotaControllerTest { long start = JobSchedulerService.sElapsedRealtimeClock.millis(); advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, jobStatus, true); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, jobStatus); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5553,18 +5553,18 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); setDischarging(); start = JobSchedulerService.sElapsedRealtimeClock.millis(); advanceElapsedClock(20 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } expected.add(createTimingSession(start, 20 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5583,7 +5583,7 @@ public class QuotaControllerTest { setCharging(); advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -5610,7 +5610,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } expected.add(createTimingSession(start, 5 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5640,7 +5640,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { @@ -5648,11 +5648,11 @@ public class QuotaControllerTest { } advanceElapsedClock(20 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus2, null); } expected.add(createTimingSession(start, MINUTE_IN_MILLIS, 3)); assertEquals(expected, @@ -5680,7 +5680,7 @@ public class QuotaControllerTest { setProcessState(ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE); advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobStatus, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobStatus, null); } assertNull(mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); } @@ -5715,7 +5715,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5741,11 +5741,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobFg3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobFg3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -5775,7 +5775,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } advanceElapsedClock(10 * SECOND_IN_MILLIS); // UID "inactive" now start = JobSchedulerService.sElapsedRealtimeClock.millis(); @@ -5785,11 +5785,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobFg3, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobFg3, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } expected.add(createTimingSession(start, 20 * SECOND_IN_MILLIS, 2)); assertEquals(expected, @@ -5825,7 +5825,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5851,11 +5851,11 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobTop, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobTop, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -5887,7 +5887,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobBg1, jobBg1); } advanceElapsedClock(5 * SECOND_IN_MILLIS); setProcessState(ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE); @@ -5904,12 +5904,12 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobTop, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobTop, null); } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobBg2, null, false); - mQuotaController.maybeStopTrackingJobLocked(jobFg1, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobBg2, null); + mQuotaController.maybeStopTrackingJobLocked(jobFg1, null); } expected.add(createTimingSession(start, 20 * SECOND_IN_MILLIS, 2)); assertEquals(expected, @@ -5946,7 +5946,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job1, job1, true); + mQuotaController.maybeStopTrackingJobLocked(job1, job1); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -5963,7 +5963,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job2, null, false); + mQuotaController.maybeStopTrackingJobLocked(job2, null); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -5981,7 +5981,7 @@ public class QuotaControllerTest { long elapsedGracePeriodMs = 2 * SECOND_IN_MILLIS; advanceElapsedClock(elapsedGracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job3, null, false); + mQuotaController.maybeStopTrackingJobLocked(job3, null); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -6005,7 +6005,7 @@ public class QuotaControllerTest { advanceElapsedClock(10 * SECOND_IN_MILLIS); expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job4, job4, true); + mQuotaController.maybeStopTrackingJobLocked(job4, job4); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -6019,7 +6019,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job5, job5, true); + mQuotaController.maybeStopTrackingJobLocked(job5, job5); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -6049,7 +6049,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, job, true); + mQuotaController.maybeStopTrackingJobLocked(job, job); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -6066,7 +6066,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -6085,7 +6085,7 @@ public class QuotaControllerTest { long elapsedGracePeriodMs = 2 * SECOND_IN_MILLIS; advanceElapsedClock(elapsedGracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, null, false); + mQuotaController.maybeStopTrackingJobLocked(job, null); } expected.add(createTimingSession(start, 12 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -6110,7 +6110,7 @@ public class QuotaControllerTest { advanceElapsedClock(10 * SECOND_IN_MILLIS); expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS + remainingGracePeriod, 1)); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, job, true); + mQuotaController.maybeStopTrackingJobLocked(job, job); } assertEquals(expected, mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -6124,7 +6124,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job, job, true); + mQuotaController.maybeStopTrackingJobLocked(job, job); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -6169,7 +6169,7 @@ public class QuotaControllerTest { // Wait for the grace period to expire so the handler can process the message. Thread.sleep(gracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job1, job1, true); + mQuotaController.maybeStopTrackingJobLocked(job1, job1); } assertNull(mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -6189,7 +6189,7 @@ public class QuotaControllerTest { // Wait for the grace period to expire so the handler can process the message. Thread.sleep(gracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job2, null, false); + mQuotaController.maybeStopTrackingJobLocked(job2, null); } assertNull(mQuotaController.getEJTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE)); @@ -6215,7 +6215,7 @@ public class QuotaControllerTest { Thread.sleep(2 * gracePeriodMs); advanceElapsedClock(gracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job3, job3, true); + mQuotaController.maybeStopTrackingJobLocked(job3, job3); } expected.add(createTimingSession(start, gracePeriodMs, 1)); assertEquals(expected, @@ -6243,7 +6243,7 @@ public class QuotaControllerTest { Thread.sleep(2 * gracePeriodMs); advanceElapsedClock(gracePeriodMs); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job4, job4, true); + mQuotaController.maybeStopTrackingJobLocked(job4, job4); } expected.add(createTimingSession(start, gracePeriodMs, 1)); assertEquals(expected, @@ -6270,7 +6270,7 @@ public class QuotaControllerTest { Thread.sleep(2 * gracePeriodMs); advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(job5, job5, true); + mQuotaController.maybeStopTrackingJobLocked(job5, job5); } expected.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expected, @@ -6424,7 +6424,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobReg1, jobReg1, true); + mQuotaController.maybeStopTrackingJobLocked(jobReg1, jobReg1); } expectedRegular.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expectedRegular, @@ -6440,7 +6440,7 @@ public class QuotaControllerTest { } advanceElapsedClock(10 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobEJ1, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobEJ1, null); } expectedEJ.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); assertEquals(expectedRegular, @@ -6461,12 +6461,12 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobEJ2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobEJ2, null); } expectedEJ.add(createTimingSession(start, 10 * SECOND_IN_MILLIS, 1)); advanceElapsedClock(5 * SECOND_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(jobReg2, null, false); + mQuotaController.maybeStopTrackingJobLocked(jobReg2, null); } expectedRegular.add( createTimingSession(start + 5 * SECOND_IN_MILLIS, 10 * SECOND_IN_MILLIS, 1)); @@ -6556,7 +6556,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5000); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(regJob, null, false); + mQuotaController.maybeStopTrackingJobLocked(regJob, null); } assertEquals(0, debit.getTallyLocked()); assertEquals(10 * MINUTE_IN_MILLIS, @@ -6570,7 +6570,7 @@ public class QuotaControllerTest { } advanceElapsedClock(5 * MINUTE_IN_MILLIS); synchronized (mQuotaController.mLock) { - mQuotaController.maybeStopTrackingJobLocked(eJob, null, false); + mQuotaController.maybeStopTrackingJobLocked(eJob, null); } assertEquals(5 * MINUTE_IN_MILLIS, debit.getTallyLocked()); assertEquals(5 * MINUTE_IN_MILLIS, diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java index 612e906713455..51d641bfb80de 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java @@ -81,8 +81,7 @@ public class StateControllerTest { public void maybeStartTrackingJobLocked(JobStatus jobStatus, JobStatus lastJob) { } - public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob, - boolean forUpdate) { + public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) { } public void dumpControllerStateLocked(IndentingPrintWriter pw,