diff options
| author | Glen Kuhne <kuh@google.com> | 2016-04-08 18:27:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-08 18:27:53 +0000 |
| commit | 2e738247c930892598473f3cbe593670ab23a02c (patch) | |
| tree | b1a8ec0b01ed3e3258f93246099dbb4c2deaeefd | |
| parent | 1a572a27cffc6ee853f9b6a40d83eef18963e2b0 (diff) | |
| parent | 70ce5a4cbaf5aaccd4e542e7bb87196fb4464a6e (diff) | |
Merge "Track WifiState on single scan start" into nyc-dev
| -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"); |