From 0140ff88f68ef7abb61558297ce8fba2da061570 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 8 Oct 2019 17:04:28 -0700 Subject: [PATCH] Fix AppStandbyController flag. mUnexempted... was using the value of the EXEMPTED_... flag. The default values were the same, but this would have caused a problem if we tried to update the value via a flag. Also removing deprecated flags. Bug: 141645789 Test: N/A Change-Id: I2ace1b510b2d7f5d6f92c16dd6302ae4e5525456 --- .../android/server/usage/AppStandbyController.java | 12 +----------- 1 file changed, 1 insertion(+), 11 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 df5d6aeb8ee51..d0c46c554ac8a 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -1849,16 +1849,6 @@ public class AppStandbyController implements AppStandbyInternal { * Observe settings changes for {@link Global#APP_IDLE_CONSTANTS}. */ private class SettingsObserver extends ContentObserver { - /** - * This flag has been used to disable app idle on older builds with bug b/26355386. - */ - @Deprecated - private static final String KEY_IDLE_DURATION_OLD = "idle_duration"; - @Deprecated - private static final String KEY_IDLE_DURATION = "idle_duration2"; - @Deprecated - private static final String KEY_WALLCLOCK_THRESHOLD = "wallclock_threshold"; - private static final String KEY_PAROLE_INTERVAL = "parole_interval"; private static final String KEY_PAROLE_WINDOW = "parole_window"; private static final String KEY_PAROLE_DURATION = "parole_duration"; @@ -1993,7 +1983,7 @@ public class AppStandbyController implements AppStandbyInternal { : DEFAULT_EXEMPTED_SYNC_START_TIMEOUT); mUnexemptedSyncScheduledTimeoutMillis = mParser.getDurationMillis( - KEY_EXEMPTED_SYNC_SCHEDULED_DOZE_HOLD_DURATION, + KEY_UNEXEMPTED_SYNC_SCHEDULED_HOLD_DURATION, COMPRESS_TIME ? ONE_MINUTE : DEFAULT_UNEXEMPTED_SYNC_SCHEDULED_TIMEOUT); // TODO