From 42ad93b5038bd253cb311b5ee40e167beb540a18 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Fri, 13 Sep 2019 13:46:31 -0700 Subject: [PATCH] Fix QuotaController constants. 1. QuotaController wasn't using the updated constants on system start. It would only use the updated constants if they were changed after system start. 2. Updating ACTIVE limits to more workable numbers. Bug: 137166468 Test: atest com.android.server.job.controllers.QuotaControllerTest Change-Id: I9210d80187e33be86b3cd56c89a198fd97f69460 Merged-In: I3e2848446b20f7258fac2d96566c96aea5715949 Merged-In: I50be8680e449bea54c2e3b8300812a00cf6567af --- .../server/job/controllers/QuotaController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/job/controllers/QuotaController.java b/services/core/java/com/android/server/job/controllers/QuotaController.java index 18d193ac68ec0..c6b082abf1afe 100644 --- a/services/core/java/com/android/server/job/controllers/QuotaController.java +++ b/services/core/java/com/android/server/job/controllers/QuotaController.java @@ -2034,10 +2034,10 @@ public final class QuotaController extends StateController { private static final long DEFAULT_MAX_EXECUTION_TIME_MS = 4 * HOUR_IN_MILLIS; private static final long DEFAULT_RATE_LIMITING_WINDOW_MS = - 10 * MINUTE_IN_MILLIS; + MINUTE_IN_MILLIS; private static final int DEFAULT_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW = 20; - private static final int DEFAULT_MAX_JOB_COUNT_ACTIVE = // 20/window = 120/hr = 1/session - DEFAULT_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW; + private static final int DEFAULT_MAX_JOB_COUNT_ACTIVE = + 75; // 75/window = 450/hr = 1/session private static final int DEFAULT_MAX_JOB_COUNT_WORKING = // 120/window = 60/hr = 12/session (int) (60.0 * DEFAULT_WINDOW_SIZE_WORKING_MS / HOUR_IN_MILLIS); private static final int DEFAULT_MAX_JOB_COUNT_FREQUENT = // 200/window = 25/hr = 25/session @@ -2045,7 +2045,7 @@ public final class QuotaController extends StateController { private static final int DEFAULT_MAX_JOB_COUNT_RARE = // 48/window = 2/hr = 16/session (int) (2.0 * DEFAULT_WINDOW_SIZE_RARE_MS / HOUR_IN_MILLIS); private static final int DEFAULT_MAX_SESSION_COUNT_ACTIVE = - 20; // 120/hr + 75; // 450/hr private static final int DEFAULT_MAX_SESSION_COUNT_WORKING = 10; // 5/hr private static final int DEFAULT_MAX_SESSION_COUNT_FREQUENT = @@ -2199,7 +2199,7 @@ public final class QuotaController extends StateController { mResolver = resolver; mResolver.registerContentObserver(Settings.Global.getUriFor( Settings.Global.JOB_SCHEDULER_QUOTA_CONTROLLER_CONSTANTS), false, this); - updateConstants(); + onChange(true, null); } @Override