Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdff1904 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix the default battery drain monitor window size in AppBatteryTracker"... 

Merge "Fix the default battery drain monitor window size in AppBatteryTracker" into tm-dev am: d6433e70

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17116786

Change-Id: I8cd023ead4dfedbe5cb5aad8439a4d1996383046
parents 083e72d7 d6433e70

services/core/java/com/android/server/am/AppBatteryTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -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(