From 70acdbf5faa80b8cb017c20901f09035b4d0596d Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Tue, 16 Nov 2021 11:04:07 -0800 Subject: [PATCH] Tweak the restricted standby bucket timeout Shorten the timeout to the restricted standby bucket, and extend the minimum required time to the restricted standby bucket. Bug: 200326767 Test: atest AppStandbyControllerTests Test: atest CtsJobSchedulerTestCases Change-Id: I03f16d407942bdab4602361ecac430be9d5d9dcf --- .../java/com/android/server/usage/AppStandbyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java index ee0995281c298..0ad70e40de7fc 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -183,7 +183,7 @@ public class AppStandbyController COMPRESS_TIME ? 1 * ONE_MINUTE : 12 * ONE_HOUR, COMPRESS_TIME ? 4 * ONE_MINUTE : 24 * ONE_HOUR, COMPRESS_TIME ? 16 * ONE_MINUTE : 48 * ONE_HOUR, - COMPRESS_TIME ? 32 * ONE_MINUTE : 45 * ONE_DAY + COMPRESS_TIME ? 32 * ONE_MINUTE : 3 * ONE_DAY }; /** The minimum allowed values for each index in {@link #DEFAULT_ELAPSED_TIME_THRESHOLDS}. */ @@ -2540,7 +2540,7 @@ public class AppStandbyController switch (name) { case KEY_AUTO_RESTRICTED_BUCKET_DELAY_MS: mInjector.mAutoRestrictedBucketDelayMs = Math.max( - COMPRESS_TIME ? ONE_MINUTE : 2 * ONE_HOUR, + COMPRESS_TIME ? ONE_MINUTE : 4 * ONE_HOUR, properties.getLong(KEY_AUTO_RESTRICTED_BUCKET_DELAY_MS, DEFAULT_AUTO_RESTRICTED_BUCKET_DELAY_MS)); break;