diff options
| author | Glen Kuhne <kuh@google.com> | 2016-04-06 10:56:50 -0700 |
|---|---|---|
| committer | Glen Kuhne <kuh@google.com> | 2016-04-07 16:34:10 -0700 |
| commit | 70ce5a4cbaf5aaccd4e542e7bb87196fb4464a6e (patch) | |
| tree | 9be705b02d9bfe2b3adc50cfeaf05405b4b5fbb8 | |
| parent | 1b36c74e3e037576522479ebb42b261020ccf76f (diff) | |
Track WifiState on single scan start
Adding a call to WifiMetrics, populating the WifiSystemStateEntries when
oneshot scans are started.
BUG=27793184
Change-Id: I694c17e7b2cfde54204ec206072a1ae5f58b088b
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMetrics.java | 3 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiScanningServiceImpl.java | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java index 5f48aa7cc..07785d235 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -568,12 +568,13 @@ public class WifiMetrics { } /** - * Increment oneshot scan count + * Increment oneshot scan count, and the associated WifiSystemScanStateCount entry */ public void incrementOneshotScanCount() { synchronized (mLock) { mWifiLogProto.numOneshotScans++; } + incrementWifiSystemScanStateCount(mWifiState, mScreenOn); } /** diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java index 4179059de..8d7cac0d0 100644 --- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java @@ -547,11 +547,6 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { switch (msg.what) { case WifiScanner.CMD_START_SINGLE_SCAN: mWifiMetrics.incrementOneshotScanCount(); - // <TODO> b/27793184 - // Determine the system state (Wifi enabled/disabled/associated...etc) and - // screenOn/Off, use it to increment the Metrics SystemScanState count - // mWifiMetrics.incrementWifiSystemScanStateCount(???, ???); - Bundle scanParams = (Bundle) msg.obj; if (scanParams == null) { replyFailed(msg, WifiScanner.REASON_INVALID_REQUEST, "params null"); |