Merge "Update FakeUid to match new methods in BatteryStats.Uid interface"

src/com/android/settings/fuelgauge/FakeUid.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge;
 
+import android.os.BatteryStats;
 import android.os.BatteryStats.Timer;
 import android.os.BatteryStats.Uid;
 import android.util.ArrayMap;
@@ -72,16 +73,6 @@ public class FakeUid extends Uid {
         return null;
     }
 
-    @Override
-    public long getWifiControllerActivity(int type, int which) {
-        return 0;
-    }
-
-    @Override
-    public long getBluetoothControllerActivity(int type, int which) {
-        return 0;
-    }
-
     @Override
     public void noteWifiRunningLocked(long elapsedRealtime) {
     }
@@ -258,4 +249,19 @@ public class FakeUid extends Uid {
     public long getCpuPowerMaUs(int which) {
         return 0;
     }
+
+    @Override
+    public BatteryStats.ControllerActivityCounter getWifiControllerActivity() {
+        return null;
+    }
+
+    @Override
+    public BatteryStats.ControllerActivityCounter getBluetoothControllerActivity() {
+        return null;
+    }
+
+    @Override
+    public BatteryStats.ControllerActivityCounter getModemControllerActivity() {
+        return null;
+    }
 }