diff options
| author | 2021-04-20 18:26:01 +0000 | |
|---|---|---|
| committer | 2021-04-20 18:26:01 +0000 | |
| commit | 0c2ec03e102dc671f7764bd0198dafbb29cdbee0 (patch) | |
| tree | b4b0d0f561d317a434438d7fde8d3b62c778dae7 | |
| parent | f55d0c0d27e9e74f16aebae1a76c5c94cca90791 (diff) | |
| parent | a41c8f7a7b8070c919ac685d928e99b3164172c0 (diff) | |
Merge "Adjust concurrency configuration." into sc-dev
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java index 366e1747d167..7dbd803bcf81 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java @@ -179,7 +179,7 @@ class JobConcurrencyManager { new WorkConfigLimitsPerMemoryTrimLevel( new WorkTypeConfig("screen_on_normal", 11, // defaultMin - List.of(Pair.create(WORK_TYPE_TOP, 2), Pair.create(WORK_TYPE_FGS, 1), + List.of(Pair.create(WORK_TYPE_TOP, 4), Pair.create(WORK_TYPE_FGS, 1), Pair.create(WORK_TYPE_EJ, 3), Pair.create(WORK_TYPE_BG, 2), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 1)), // defaultMax @@ -202,7 +202,7 @@ class JobConcurrencyManager { List.of(Pair.create(WORK_TYPE_TOP, 4), Pair.create(WORK_TYPE_FGS, 1), Pair.create(WORK_TYPE_EJ, 1)), // defaultMax - List.of(Pair.create(WORK_TYPE_BG, 1), + List.of(Pair.create(WORK_TYPE_BG, 2), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 1), Pair.create(WORK_TYPE_BGUSER, 1)) ), @@ -218,23 +218,23 @@ class JobConcurrencyManager { ); private static final WorkConfigLimitsPerMemoryTrimLevel CONFIG_LIMITS_SCREEN_OFF = new WorkConfigLimitsPerMemoryTrimLevel( - new WorkTypeConfig("screen_off_normal", 15, + new WorkTypeConfig("screen_off_normal", 16, // defaultMin List.of(Pair.create(WORK_TYPE_TOP, 4), Pair.create(WORK_TYPE_FGS, 2), Pair.create(WORK_TYPE_EJ, 3), Pair.create(WORK_TYPE_BG, 2), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 1)), // defaultMax - List.of(Pair.create(WORK_TYPE_BG, 6), + List.of(Pair.create(WORK_TYPE_BG, 10), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 2), Pair.create(WORK_TYPE_BGUSER, 3)) ), - new WorkTypeConfig("screen_off_moderate", 15, + new WorkTypeConfig("screen_off_moderate", 14, // defaultMin - List.of(Pair.create(WORK_TYPE_TOP, 6), Pair.create(WORK_TYPE_FGS, 2), + List.of(Pair.create(WORK_TYPE_TOP, 4), Pair.create(WORK_TYPE_FGS, 2), Pair.create(WORK_TYPE_EJ, 3), Pair.create(WORK_TYPE_BG, 2), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 1)), // defaultMax - List.of(Pair.create(WORK_TYPE_BG, 4), + List.of(Pair.create(WORK_TYPE_BG, 7), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 1), Pair.create(WORK_TYPE_BGUSER, 1)) ), @@ -243,7 +243,7 @@ class JobConcurrencyManager { List.of(Pair.create(WORK_TYPE_TOP, 4), Pair.create(WORK_TYPE_FGS, 1), Pair.create(WORK_TYPE_EJ, 2), Pair.create(WORK_TYPE_BG, 1)), // defaultMax - List.of(Pair.create(WORK_TYPE_BG, 1), + List.of(Pair.create(WORK_TYPE_BG, 3), Pair.create(WORK_TYPE_BGUSER_IMPORTANT, 1), Pair.create(WORK_TYPE_BGUSER, 1)) ), |