diff options
| author | 2022-03-08 20:47:18 +0000 | |
|---|---|---|
| committer | 2022-03-08 20:47:18 +0000 | |
| commit | d6433e7015fc4dfeeadd0d2a4a8e1fd480e3096e (patch) | |
| tree | ce8b2e689fed788463a73bf408f5972008f1ac13 | |
| parent | 648426f3fe5e0bd68ee92f2cb72258a6b797765d (diff) | |
| parent | 27099ba63f49eeebe327403b27880dc147774a9a (diff) | |
Merge "Fix the default battery drain monitor window size in AppBatteryTracker" into tm-dev
| -rw-r--r-- | services/core/java/com/android/server/am/AppBatteryTracker.java | 6 |
1 files 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 7579d2bc78fd..7cd45fed1498 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<AppBatteryPolicy> 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<AppBatteryPolicy> 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( |