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

Commit daeee0b5 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "BatteryStats: Don't log BluetoothScanTimer when it doesn't exist" into nyc-dev

parents e740c84d ba9d8939

core/java/android/os/BatteryStats.java

+1 −7
Original line number Diff line number Diff line
@@ -3094,14 +3094,8 @@ public abstract class BatteryStats implements Parcelable { 
            dumpControllerActivityLine(pw, uid, category, WIFI_CONTROLLER_DATA,

                    u.getWifiControllerActivity(), which);



            // Dump Bluetooth scan data, per UID.

            final long bleScanTimeUs = u.getBluetoothScanTimer().getTotalTimeLocked(

            dumpTimer(pw, uid, category, BLUETOOTH_MISC_DATA, u.getBluetoothScanTimer(),

                    rawRealtime, which);

            final int bleScanCount = u.getBluetoothScanTimer().getCountLocked(which);

            if (bleScanTimeUs != 0 || bleScanCount != 0) {

                dumpLine(pw, uid, category, BLUETOOTH_MISC_DATA,

                        bleScanTimeUs / 1000, bleScanCount);

            }



            dumpControllerActivityLine(pw, uid, category, BLUETOOTH_CONTROLLER_DATA,

                    u.getBluetoothControllerActivity(), which);