From 27099ba63f49eeebe327403b27880dc147774a9a Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Tue, 8 Mar 2022 07:58:34 +0000 Subject: [PATCH] Fix the default battery drain monitor window size in AppBatteryTracker The window size in config file is in seconds, needs to convert to milliseconds. Bug: 223297715 Test: Manual - run battery intensive apps & dumpsys activity -a Change-Id: I66f5a62f33aa1d8ac5157f974f172dc5dce9906c --- .../core/java/com/android/server/am/AppBatteryTracker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/AppBatteryTracker.java b/services/core/java/com/android/server/am/AppBatteryTracker.java index 7579d2bc78fda..7cd45fed1498b 100644 --- a/services/core/java/com/android/server/am/AppBatteryTracker.java +++ b/services/core/java/com/android/server/am/AppBatteryTracker.java @@ -1217,7 +1217,7 @@ final class AppBatteryTracker extends BaseAppStateTracker mDefaultBgCurrentDrainBgRestrictedThreshold = isLowRamDeviceStatic() ? val[1] : val[0]; mDefaultBgCurrentDrainWindowMs = resources.getInteger( - R.integer.config_bg_current_drain_window); + R.integer.config_bg_current_drain_window) * 1_000; val = getFloatArray(resources.obtainTypedArray( R.array.config_bg_current_drain_high_threshold_to_restricted_bucket)); mDefaultBgCurrentDrainRestrictedBucketHighThreshold = @@ -1227,9 +1227,9 @@ final class AppBatteryTracker extends BaseAppStateTracker mDefaultBgCurrentDrainBgRestrictedHighThreshold = isLowRamDeviceStatic() ? val[1] : val[0]; mDefaultBgCurrentDrainMediaPlaybackMinDuration = resources.getInteger( - R.integer.config_bg_current_drain_media_playback_min_duration); + R.integer.config_bg_current_drain_media_playback_min_duration) * 1_000; mDefaultBgCurrentDrainLocationMinDuration = resources.getInteger( - R.integer.config_bg_current_drain_location_min_duration); + R.integer.config_bg_current_drain_location_min_duration) * 1_000; mDefaultBgCurrentDrainEventDurationBasedThresholdEnabled = resources.getBoolean( R.bool.config_bg_current_drain_event_duration_based_threshold_enabled); mDefaultCurrentDrainTypesToRestrictedBucket = resources.getInteger(