From 99882bc49db680277d8096e724301b4d26db58da Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Thu, 17 Feb 2022 18:15:40 +0000 Subject: [PATCH] Cancel previous cutoffs. Make sure to cancel previously scheduled cutoffs to make sure we don't have duplicate and stale cutoffs in the queue. Bug: 218216817 Test: atest FrameworksMockingServicesTests:QuotaControllerTest Change-Id: I579d915adb0f00f8f6de73c39e65ac28b4246d76 --- .../android/server/job/controllers/QuotaController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 b96055f2a4526..efb1bbaf51b6f 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 @@ -2169,7 +2169,7 @@ public final class QuotaController extends StateController { } scheduleCutoff(); } else if (mRegularJobTimer && priorityLowered) { - scheduleCutoff(); + rescheduleCutoff(); } } } @@ -2205,7 +2205,7 @@ public final class QuotaController extends StateController { mRunningBgJobs.valueAt(i).getEffectivePriority()); } if (mLowestPriority != oldPriority) { - scheduleCutoff(); + rescheduleCutoff(); } } } @@ -2705,7 +2705,7 @@ public final class QuotaController extends StateController { if (DEBUG) { Slog.d(TAG, pkg + " had early REACHED_QUOTA message"); } - mPkgTimers.get(pkg.userId, pkg.packageName).scheduleCutoff(); + mPkgTimers.get(pkg.userId, pkg.packageName).rescheduleCutoff(); } break; } @@ -2727,7 +2727,7 @@ public final class QuotaController extends StateController { if (DEBUG) { Slog.d(TAG, pkg + " had early REACHED_EJ_QUOTA message"); } - mEJPkgTimers.get(pkg.userId, pkg.packageName).scheduleCutoff(); + mEJPkgTimers.get(pkg.userId, pkg.packageName).rescheduleCutoff(); } break; }