summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-05-18 20:44:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-18 20:44:02 +0000
commit18eda1dc93cdb4fb79f8022c661b7464c2ac0397 (patch)
tree1974fdaae8c66b3f4f94930a5730ba868e582f61
parent43d1480fe5ec04f3dec53cbe9d6c46186ddc8d44 (diff)
parentee9329dc901d59b8ae1e39edac99bd9d91306d2f (diff)
Merge "WifiConnectivityManager: partial scan only when connected" into nyc-dev
-rw-r--r--service/java/com/android/server/wifi/WifiConnectivityManager.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 8200ef633..dd182dd16 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -663,10 +663,11 @@ public class WifiConnectivityManager {
boolean isFullBandScan = true;
// If the WiFi traffic is heavy, only partial scan is initiated.
- if (mWifiInfo.txSuccessRate
- > mConfigManager.MAX_TX_PACKET_FOR_FULL_SCANS
- || mWifiInfo.rxSuccessRate
- > mConfigManager.MAX_RX_PACKET_FOR_FULL_SCANS) {
+ if (mWifiState == WIFI_STATE_CONNECTED
+ && (mWifiInfo.txSuccessRate
+ > mConfigManager.MAX_TX_PACKET_FOR_FULL_SCANS
+ || mWifiInfo.rxSuccessRate
+ > mConfigManager.MAX_RX_PACKET_FOR_FULL_SCANS)) {
localLog("No full band scan due to heavy traffic, txSuccessRate="
+ mWifiInfo.txSuccessRate + " rxSuccessRate="
+ mWifiInfo.rxSuccessRate);