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

Merge "Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev am: daeee0b" into nyc-dev-plus-aosp

Browse Source 
am: e0bd3a0

* commit 'e0bd3a07ed46dc9570976eeaabe9d5031c35efb4':
  BatteryStats: Don't log BluetoothScanTimer when it doesn't exist

Change-Id: Id83ac464c1a744a4b2538f23908c72ffc453249d
This commit is contained in:
Adam Lesinski
2016-04-12 22:37:39 +00:00
committed by android-build-merger
parent 959bc9b468 e0bd3a07ed
commit b9dcdccbce
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/BatteryStats.java
View File

@@ -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);