Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev

2015-07-06 18:00:24 +00:00
parent 7fd3c296f1 f7808b7cf0
commit 1a257545b2
1 changed files with 2 additions and 2 deletions
--- 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<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats =
                u.getWakelockStats();