Merge "FakeUid: measured energy for Wifi, Bluetooth" into sc-dev

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

@@ -356,7 +356,7 @@ public class FakeUid extends Uid {
     }
 
     @Override
-    public long getScreenOnMeasuredBatteryConsumptionUC() {
+    public long getBluetoothMeasuredBatteryConsumptionUC() {
         return 0;
     }
 
@@ -365,6 +365,16 @@ public class FakeUid extends Uid {
         return 0;
     }
 
+    @Override
+    public long getScreenOnMeasuredBatteryConsumptionUC() {
+        return 0;
+    }
+
+    @Override
+    public long getWifiMeasuredBatteryConsumptionUC() {
+        return 0;
+    }
+
     @Override
     public long[] getCustomConsumerMeasuredBatteryConsumptionUC() {
         return null;