commit 1a257545b2d1e8bd95393ee6637e70be7d230bc6
author Adam Lesinski <adamlesinski@google.com> Mon Jul 06 18:00:24 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 06 18:00:33 2015 +0000
tree 0e04b9e5c1cb59dd709f254ce6464500fa2d6a9a
parent 7fd3c296f1991e321e4c69a5e7f918cc3d252625
parent f7808b7cf073175eb34a95760ef01e3dd61dd3ee

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

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();