summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-09-18 20:26:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-18 20:26:06 +0000
commit031bbef57e7d8e18b238bac4e3e7c356b0055655 (patch)
tree7910c0c2a2e8b85b69e65b9de13905fb84a762b1 /src
parent43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d (diff)
parent2350b8445c72d7d2814ec355e40dfe5aeb5e88a3 (diff)
downloadpackages_apps_Settings-031bbef57e7d8e18b238bac4e3e7c356b0055655.zip
packages_apps_Settings-031bbef57e7d8e18b238bac4e3e7c356b0055655.tar.gz
packages_apps_Settings-031bbef57e7d8e18b238bac4e3e7c356b0055655.tar.bz2
Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/fuelgauge/FakeUid.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index aaa30a2..7fd66c5 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -246,7 +246,7 @@ public class FakeUid extends Uid {
}
@Override
- public long getTimeAtCpuSpeed(int step, int which) {
+ public long getTimeAtCpuSpeed(int cluster, int step, int which) {
return 0;
}