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

Fix QuotaController constants.

Browse Source 
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: I3e2848446b20f7258fac2d96566c96aea5715949
This commit is contained in:
Kweku Adams
2019-09-12 18:39:24 -07:00
parent cbc3d5d0ea
commit 24cbc741d5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/job/controllers/QuotaController.java
View File

@@ -2034,10 +2034,10 @@ public final class QuotaController extends StateController {
private static final long DEFAULT_MAX_EXECUTION_TIME_MS = private static final long DEFAULT_MAX_EXECUTION_TIME_MS =
4 * HOUR_IN_MILLIS; 4 * HOUR_IN_MILLIS;
private static final long DEFAULT_RATE_LIMITING_WINDOW_MS = 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_PER_RATE_LIMITING_WINDOW = 20;
private static final int DEFAULT_MAX_JOB_COUNT_ACTIVE = // 20/window = 120/hr = 1/session private static final int DEFAULT_MAX_JOB_COUNT_ACTIVE =
DEFAULT_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW; 75; // 75/window = 450/hr = 1/session
private static final int DEFAULT_MAX_JOB_COUNT_WORKING = // 120/window = 60/hr = 12/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); (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 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 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); (int) (2.0 * DEFAULT_WINDOW_SIZE_RARE_MS / HOUR_IN_MILLIS);
private static final int DEFAULT_MAX_SESSION_COUNT_ACTIVE = private static final int DEFAULT_MAX_SESSION_COUNT_ACTIVE =
20; // 120/hr 75; // 450/hr
private static final int DEFAULT_MAX_SESSION_COUNT_WORKING = private static final int DEFAULT_MAX_SESSION_COUNT_WORKING =
10; // 5/hr 10; // 5/hr
private static final int DEFAULT_MAX_SESSION_COUNT_FREQUENT = private static final int DEFAULT_MAX_SESSION_COUNT_FREQUENT =
@@ -2199,7 +2199,7 @@ public final class QuotaController extends StateController {
mResolver = resolver; mResolver = resolver;
mResolver.registerContentObserver(Settings.Global.getUriFor( mResolver.registerContentObserver(Settings.Global.getUriFor(
Settings.Global.JOB_SCHEDULER_QUOTA_CONTROLLER_CONSTANTS), false, this); Settings.Global.JOB_SCHEDULER_QUOTA_CONTROLLER_CONSTANTS), false, this);
updateConstants(); onChange(true, null);
} }
@Override @Override