am 948ac4fa: am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev

* commit '948ac4facb4d1b81a981af1836e044025bb607e9':
  BatteryStats: Fix issue with method parameter order...
This commit is contained in:
Adam Lesinski
2015-07-06 18:44:59 +00:00
committed by Android Git Automerger

View File

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