summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-09-13 21:46:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-09-13 21:46:47 +0000
commitaf18cb56bff6d46c145f089449a9f56fc75ad0b7 (patch)
tree7b3a87a0d091acb981265e94938ed92b71b735f4
parent421f0d367dc6b96c015232290eeae9250e6f475d (diff)
parent42ad93b5038bd253cb311b5ee40e167beb540a18 (diff)
Merge "Fix QuotaController constants." into qt-qpr1-dev
-rw-r--r--services/core/java/com/android/server/job/controllers/QuotaController.java10
1 files 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 18d193ac68ec..c6b082abf1af 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