diff options
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 16 |
2 files changed, 5 insertions, 19 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 51db2d200461..e5415430d82a 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -927,7 +927,7 @@ message WifiLockStateChanged { * Logs wifi signal strength changes. * * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java + * frameworks/opt/net/wifi/service/java/com/android/server/wifi/ClientModeImpl.java */ message WifiSignalStrengthChanged { // Signal strength, from frameworks/base/core/proto/android/telephony/enums.proto. @@ -938,7 +938,7 @@ message WifiSignalStrengthChanged { * Logs wifi scans performed by an app. * * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java + * frameworks/opt/net/wifi/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java */ message WifiScanStateChanged { repeated AttributionNode attribution_node = 1; @@ -954,7 +954,7 @@ message WifiScanStateChanged { * Logs wifi multicast locks held by an app * * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java + * frameworks/opt/net/wifi/service/java/com/android/server/wifi/WifiMulticastLockManager.java */ message WifiMulticastLockStateChanged { repeated AttributionNode attribution_node = 1; @@ -964,6 +964,8 @@ message WifiMulticastLockStateChanged { ON = 1; } optional State state = 2; + + optional string tag = 3; } /** diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 017da550c9d3..cc8da5c6317f 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -5970,7 +5970,6 @@ public class BatteryStatsImpl extends BatteryStats { } else { stopAllWifiSignalStrengthTimersLocked(-1); } - StatsLog.write(StatsLog.WIFI_SIGNAL_STRENGTH_CHANGED, strengthBin); mWifiSignalStrengthBin = strengthBin; } } @@ -6138,8 +6137,6 @@ public class BatteryStatsImpl extends BatteryStats { for (int i=0; i<N; i++) { final int uid = mapUid(ws.get(i)); noteWifiScanStartedLocked(uid); - StatsLog.write_non_chained(StatsLog.WIFI_SCAN_STATE_CHANGED, ws.get(i), ws.getName(i), - StatsLog.WIFI_SCAN_STATE_CHANGED__STATE__ON); } final List<WorkChain> workChains = ws.getWorkChains(); @@ -6148,8 +6145,6 @@ public class BatteryStatsImpl extends BatteryStats { final WorkChain workChain = workChains.get(i); final int uid = mapUid(workChain.getAttributionUid()); noteWifiScanStartedLocked(uid); - StatsLog.write(StatsLog.WIFI_SCAN_STATE_CHANGED, workChain.getUids(), - workChain.getTags(), StatsLog.WIFI_SCAN_STATE_CHANGED__STATE__ON); } } } @@ -6159,8 +6154,6 @@ public class BatteryStatsImpl extends BatteryStats { for (int i=0; i<N; i++) { final int uid = mapUid(ws.get(i)); noteWifiScanStoppedLocked(uid); - StatsLog.write_non_chained(StatsLog.WIFI_SCAN_STATE_CHANGED, ws.get(i), ws.getName(i), - StatsLog.WIFI_SCAN_STATE_CHANGED__STATE__OFF); } final List<WorkChain> workChains = ws.getWorkChains(); @@ -6169,9 +6162,6 @@ public class BatteryStatsImpl extends BatteryStats { final WorkChain workChain = workChains.get(i); final int uid = mapUid(workChain.getAttributionUid()); noteWifiScanStoppedLocked(uid); - StatsLog.write(StatsLog.WIFI_SCAN_STATE_CHANGED, - workChain.getUids(), workChain.getTags(), - StatsLog.WIFI_SCAN_STATE_CHANGED__STATE__OFF); } } } @@ -7190,9 +7180,6 @@ public class BatteryStatsImpl extends BatteryStats { WIFI_MULTICAST_ENABLED, mBsi.mWifiMulticastTimers, mBsi.mOnBatteryTimeBase); } mWifiMulticastTimer.startRunningLocked(elapsedRealtimeMs); - StatsLog.write_non_chained( - StatsLog.WIFI_MULTICAST_LOCK_STATE_CHANGED, getUid(), null, - StatsLog.WIFI_MULTICAST_LOCK_STATE_CHANGED__STATE__ON); } mWifiMulticastWakelockCount++; } @@ -7206,9 +7193,6 @@ public class BatteryStatsImpl extends BatteryStats { mWifiMulticastWakelockCount--; if (mWifiMulticastWakelockCount == 0) { mWifiMulticastTimer.stopRunningLocked(elapsedRealtimeMs); - StatsLog.write_non_chained( - StatsLog.WIFI_MULTICAST_LOCK_STATE_CHANGED, getUid(), null, - StatsLog.WIFI_MULTICAST_LOCK_STATE_CHANGED__STATE__OFF); } } |