Merge "Add bt traffic accounting"

2016-01-21 02:22:05 +00:00
parent 021dcb06e1 d4574a06b2
commit 2e6e7d1095
1 changed files with 5 additions and 0 deletions
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -77,6 +77,11 @@ public class FakeUid extends Uid {
        return 0;
    }

+    @Override
+    public long getBluetoothControllerActivity(int type, int which) {
+        return 0;
+    }
+
    @Override
    public void noteWifiRunningLocked(long elapsedRealtime) {
    }