diff options
author | Mike Lockwood <lockwood@android.com> | 2009-07-09 23:39:01 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2009-07-09 23:39:01 -0400 |
commit | 622f82a0c78aa69d9b3b29ea0617cb8002b57c16 (patch) | |
tree | 009f53795947f80cf804efdf2cabb9526ba07c7e /wifi | |
parent | 2eedb2515b733aaba0a92944def8156ef379e0da (diff) | |
download | frameworks_base-622f82a0c78aa69d9b3b29ea0617cb8002b57c16.zip frameworks_base-622f82a0c78aa69d9b3b29ea0617cb8002b57c16.tar.gz frameworks_base-622f82a0c78aa69d9b3b29ea0617cb8002b57c16.tar.bz2 |
WifiService: Remove hidden AP counting logic for active/passive scanning mode.
Apparently this code was not 100% correct, and now the Wifi driver is responsible
for setting the scan mode to active for hidden networks, so this is no longer needed.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index afbb19b..0e2eb38 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -242,7 +242,6 @@ public class WifiStateTracker extends NetworkStateTracker { private SettingsObserver mSettingsObserver; private boolean mIsScanModeActive; - private boolean mIsScanModeSetDueToAHiddenNetwork; // Wi-Fi run states: private static final int RUN_STATE_STARTING = 1; @@ -314,7 +313,6 @@ public class WifiStateTracker extends NetworkStateTracker { mScanResults = new ArrayList<ScanResult>(); // Allocate DHCP info object once, and fill it in on each request mDhcpInfo = new DhcpInfo(); - mIsScanModeSetDueToAHiddenNetwork = false; mRunState = RUN_STATE_STARTING; // Setting is in seconds @@ -1019,12 +1017,7 @@ public class WifiStateTracker extends NetworkStateTracker { * On receiving the first scan results after connecting to * the supplicant, switch scan mode over to passive. */ - if (!mIsScanModeSetDueToAHiddenNetwork) { - // This is the only place at the moment where we set - // the scan mode NOT due to a hidden network. This is - // what the second parameter value (false) stands for. - setScanMode(false, false); - } + setScanMode(false); break; case EVENT_POLL_INTERVAL: @@ -1162,9 +1155,7 @@ public class WifiStateTracker extends NetworkStateTracker { return disabledNetwork; } - public synchronized void setScanMode( - boolean isScanModeActive, boolean setDueToAHiddenNetwork) { - mIsScanModeSetDueToAHiddenNetwork = setDueToAHiddenNetwork; + public synchronized void setScanMode(boolean isScanModeActive) { if (mIsScanModeActive != isScanModeActive) { WifiNative.setScanModeCommand(mIsScanModeActive = isScanModeActive); } |