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

Merge "Fix updateBluetoothStateLocked comments" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-20 09:58:28 +00:00
committed by Android (Google) Code Review
parent 3346694817 d9f98565b2
commit 423adbf3b5
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12088,7 +12088,7 @@ public class BatteryStatsImpl extends BatteryStats {
/**
* Distribute Bluetooth energy info and network traffic to apps.
*
* @param info The energy information from the bluetooth controller.
* @param info The accumulated energy information from the bluetooth controller.
*/
public void updateBluetoothStateLocked(@Nullable final BluetoothActivityEnergyInfo info,
final long consumedChargeUC, long elapsedRealtimeMs, long uptimeMs) {
@@ -12100,9 +12100,6 @@ public class BatteryStatsImpl extends BatteryStats {
return;
}
if (!mOnBatteryInternal || mIgnoreNextExternalStats) {
// TODO(174818545): mLastBluetoothActivityInfo is actually extremely suspicious.
// Firstly, the following line was originally missing. But even more so, BESW says that
// info is a delta, not a total, so this entire algorithm requires review.
mLastBluetoothActivityInfo.set(info);
return;
}

4
services/core/java/com/android/server/am/BatteryExternalStatsWorker.java
View File

@@ -137,8 +137,8 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
@GuardedBy("mWorkerLock")
private PowerStatsInternal mPowerStatsInternal = null;
// WiFi keeps an accumulated total of stats, unlike Bluetooth.
// Keep the last WiFi stats so we can compute a delta.
// WiFi keeps an accumulated total of stats. Keep the last WiFi stats so we can compute a delta.
// (This is unlike Bluetooth, where BatteryStatsImpl is left responsible for taking the delta.)
@GuardedBy("mWorkerLock")
private WifiActivityEnergyInfo mLastWifiInfo =
new WifiActivityEnergyInfo(0, 0, 0, 0, 0, 0);