commit f7808b7cf073175eb34a95760ef01e3dd61dd3ee
author Adam Lesinski <adamlesinski@google.com> Mon Jul 06 10:17:24 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Jul 06 10:17:24 2015 -0700
tree 2f8f6fc9436f2735f36e7fbc6fcb580e6387eb0a
parent d3ecb3e6f04a0f76c886238af6bef1d10b987a42

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

core/java/com/android/internal/os/WakelockPowerCalculator.java

diff --git a/core/java/com/android/internal/os/WakelockPowerCalculator.java b/core/java/com/android/internal/os/WakelockPowerCalculator.java
index 7575010f..c7897b2 100644
--- a/core/java/com/android/internal/os/WakelockPowerCalculator.java
+++ b/core/java/com/android/internal/os/WakelockPowerCalculator.java
@@ -30,8 +30,8 @@
     }
 
     @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<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats =
                 u.getWakelockStats();