diff options
| author | 2018-09-17 14:59:41 -0700 | |
|---|---|---|
| committer | 2018-09-17 14:59:41 -0700 | |
| commit | c77b02028e145fe82d982d554b95a9d1f99eccae (patch) | |
| tree | ebd6da20c6ff5b30bd88e916f71596853b051491 | |
| parent | eb72ec648e07d5c4d1983f5a647024dfe6efef58 (diff) | |
| parent | 18852e36363f69e729a0fd2e885b247881488adb (diff) | |
Merge "Unifying source of statsd BleScan calls and cleaning it up." am: 056a095dd3 am: 7ed0147613
am: 18852e3636
Change-Id: Ifcc5f22a921f6f4d50eb47a329aa2e3db61410ef
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 4 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 786e76c9d1cf..c8e6b46d6cff 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -432,9 +432,9 @@ message BleScanStateChanged { * Logs reporting of a ble scan finding results. * * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java + * packages/apps/Bluetooth/src/com/android/bluetooth/gatt/AppScanStats.java */ -// TODO: Consider changing to tracking per-scanner-id (log from AppScanStats). +// TODO: Consider also tracking per-scanner-id. message BleScanResultReceived { repeated AttributionNode attribution_node = 1; diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index d0795c95a8ad..31f13c33c167 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -5758,8 +5758,6 @@ public class BatteryStatsImpl extends BatteryStats { for (int i = 0; i < N; i++) { int uid = mapUid(ws.get(i)); getUidStatsLocked(uid).noteBluetoothScanResultsLocked(numNewResults); - StatsLog.write_non_chained(StatsLog.BLE_SCAN_RESULT_RECEIVED, ws.get(i), ws.getName(i), - numNewResults); } final List<WorkChain> workChains = ws.getWorkChains(); @@ -5768,8 +5766,6 @@ public class BatteryStatsImpl extends BatteryStats { final WorkChain wc = workChains.get(i); int uid = mapUid(wc.getAttributionUid()); getUidStatsLocked(uid).noteBluetoothScanResultsLocked(numNewResults); - StatsLog.write(StatsLog.BLE_SCAN_RESULT_RECEIVED, - wc.getUids(), wc.getTags(), numNewResults); } } } |