From 5dcfc0c12734aa24256b33df36966db55dafd165 Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Tue, 12 Apr 2022 23:13:51 -0700 Subject: [PATCH] Clamp the scaling factor of battery usage in app battery tracker Bug: 229035327 Bug: 203105544 Test: Manual Test: atest FrameworksMockingServicesTests:BackgroundRestrictionTest Change-Id: I39afeec2a5b57c63e839b710370bbc8a60af15b9 --- services/core/java/com/android/server/am/AppBatteryTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/AppBatteryTracker.java b/services/core/java/com/android/server/am/AppBatteryTracker.java index 64ff532b026a5..90201a0336685 100644 --- a/services/core/java/com/android/server/am/AppBatteryTracker.java +++ b/services/core/java/com/android/server/am/AppBatteryTracker.java @@ -654,7 +654,7 @@ final class AppBatteryTracker extends BaseAppStateTracker final long start = stats.getStatsStartTimestamp(); final long end = stats.getStatsEndTimestamp(); final double scale = expectedDuration > 0 - ? (expectedDuration * 1.0d) / (end - start) : 1.0d; + ? Math.min((expectedDuration * 1.0d) / (end - start), 1.0d) : 1.0d; final AppBatteryPolicy bgPolicy = mInjector.getPolicy(); for (UidBatteryConsumer uidConsumer : uidConsumers) { // TODO: b/200326767 - as we are not supporting per proc state attribution yet,