Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b495754 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Fix Bluetooth power accounting after a BT crash" into sc-dev am: cfc8359f am: c739df25 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15055646

Change-Id: I31031ef25603b4acb7f889116c0d5c78cd558eb9
parents 23a83b1b c739df25

core/java/com/android/internal/os/BatteryStatsImpl.java

+18 −0
Original line number Diff line number Diff line
@@ -12143,6 +12143,15 @@ public class BatteryStatsImpl extends BatteryStats { 
                }

            }

        }













        void reset() {













            idleTimeMs = 0;













            rxTimeMs = 0;













            txTimeMs = 0;













            energy = 0;













            uidRxBytes.clear();













            uidTxBytes.clear();













        }















    }





























    private final BluetoothActivityInfoCache mLastBluetoothActivityInfo









@@ -12169,6 +12178,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 =