diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-09-18 20:32:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-18 20:32:04 +0000 |
| commit | 65477c800fabbce6586bc2782ce56167e0bd2734 (patch) | |
| tree | fd5e2ab58fcd4b59571f412425bd57a04a136685 /src/com/android/settings/fuelgauge | |
| parent | aead1b2581c2594c18e16b56325b615c5944f6d7 (diff) | |
| parent | 031bbef57e7d8e18b238bac4e3e7c356b0055655 (diff) | |
| download | packages_apps_Settings-65477c800fabbce6586bc2782ce56167e0bd2734.zip packages_apps_Settings-65477c800fabbce6586bc2782ce56167e0bd2734.tar.gz packages_apps_Settings-65477c800fabbce6586bc2782ce56167e0bd2734.tar.bz2 | |
am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
Update implementation to match BatteryStats.Uid
Diffstat (limited to 'src/com/android/settings/fuelgauge')
| -rw-r--r-- | src/com/android/settings/fuelgauge/FakeUid.java | 2 |
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; } |