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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13838208

Change-Id: Idb961520cbb443650c7d021e0b164116230d73c4

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;