Merge "Update FakeUid to match ag/2099507" into oc-dev

am: 8da75be811 Change-Id: I26423036695c3162c86ed1a7bed1b82867aa0b71
2017-04-13 20:21:17 +00:00
parent 0e91dba0cf 8da75be811
commit 18fe8176f6
1 changed files with 0 additions and 5 deletions
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -265,11 +265,6 @@ public class FakeUid extends Uid {
        return 0;
    }

-    @Override
-    public long getCpuPowerMaUs(int which) {
-        return 0;
-    }
-
    @Override
    public BatteryStats.ControllerActivityCounter getWifiControllerActivity() {
        return null;