Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Bluetooth power accounting after a BT crash

Browse Source 
Bug: 191488536
Test: Use BatteryStatsViewer to take a note of BT usage time
      $ adb shell killall com.android.bluetooth
      Use BatteryStatsViewer to verify that BT usage time is going up
Change-Id: I8438f19bb4bd6365da6d582fb7347f0a2cbddc1c
This commit is contained in:
Dmitri Plotnikov
2021-06-21 17:18:38 -07:00
parent 4ed9ab51ff
commit 1beb4fcdbd
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -12141,6 +12141,15 @@ public class BatteryStatsImpl extends BatteryStats {
}
}
}
void reset() {
idleTimeMs = 0;
rxTimeMs = 0;
txTimeMs = 0;
energy = 0;
uidRxBytes.clear();
uidTxBytes.clear();
}
}
private final BluetoothActivityInfoCache mLastBluetoothActivityInfo
@@ -12167,6 +12176,15 @@ public class BatteryStatsImpl extends BatteryStats {
mHasBluetoothReporting = true;
if (info.getControllerRxTimeMillis() < mLastBluetoothActivityInfo.rxTimeMs
|| info.getControllerTxTimeMillis() < mLastBluetoothActivityInfo.txTimeMs
|| info.getControllerIdleTimeMillis() < mLastBluetoothActivityInfo.idleTimeMs
|| info.getControllerEnergyUsed() < mLastBluetoothActivityInfo.energy) {
// A drop in accumulated Bluetooth stats is a sign of a Bluetooth crash.
// Reset the preserved previous snapshot in order to restart accumulating deltas.
mLastBluetoothActivityInfo.reset();
}
final long rxTimeMs =
info.getControllerRxTimeMillis() - mLastBluetoothActivityInfo.rxTimeMs;
final long txTimeMs =