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

Commit 056a095d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Unifying source of statsd BleScan calls and cleaning it up."

parents 34721e16 ae6738ed

cmds/statsd/src/atoms.proto

+2 −2
Original line number Diff line number Diff line
@@ -272,9 +272,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;

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

+0 −4
Original line number Diff line number Diff line
@@ -5800,8 +5800,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();









@@ -5810,8 +5808,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);















            }















        }















    }