From f7808b7cf073175eb34a95760ef01e3dd61dd3ee Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 6 Jul 2015 10:17:24 -0700 Subject: [PATCH] BatteryStats: Fix issue with method parameter order... Argh, this explains some weird instances of negative power given to Wakelock usage. Realtime and uptime were switched in the parameter list, and since they're both longs, compiler was happy. Bug:22295225 Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228 --- .../java/com/android/internal/os/WakelockPowerCalculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/os/WakelockPowerCalculator.java b/core/java/com/android/internal/os/WakelockPowerCalculator.java index 7575010f5b420..c7897b2bbc3bd 100644 --- a/core/java/com/android/internal/os/WakelockPowerCalculator.java +++ b/core/java/com/android/internal/os/WakelockPowerCalculator.java @@ -30,8 +30,8 @@ public class WakelockPowerCalculator extends PowerCalculator { } @Override - public void calculateApp(BatterySipper app, BatteryStats.Uid u, long rawUptimeUs, - long rawRealtimeUs, int statsType) { + public void calculateApp(BatterySipper app, BatteryStats.Uid u, long rawRealtimeUs, + long rawUptimeUs, int statsType) { long wakeLockTimeUs = 0; final ArrayMap wakelockStats = u.getWakelockStats();