drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Wifi test" into jb-dev

Browse Source
This commit is contained in:
Xia Wang
2012-05-08 19:13:14 -07:00
committed by Android (Google) Code Review
parent feecf9d786 81341fee6d
commit 72e95cfef0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
View File

@ -246,9 +246,7 @@ public class ConnectivityManagerTestActivity extends Activity {
initializeNetworkStates(); initializeNetworkStates();
mWifiManager.setWifiEnabled(true);
log("Clear Wifi before we start the test."); log("Clear Wifi before we start the test.");
sleep(SHORT_TIMEOUT);
removeConfiguredNetworksAndDisableWifi(); removeConfiguredNetworksAndDisableWifi();
mWifiRegexs = mCM.getTetherableWifiRegexs(); mWifiRegexs = mCM.getTetherableWifiRegexs();
} }
@ -645,6 +643,11 @@ public class ConnectivityManagerTestActivity extends Activity {
*/ */
public boolean disconnectAP() { public boolean disconnectAP() {
// remove saved networks // remove saved networks
if (!mWifiManager.isWifiEnabled()) {
log("Enabled wifi before remove configured networks");
mWifiManager.setWifiEnabled(true);
sleep(SHORT_TIMEOUT);
}
List<WifiConfiguration> wifiConfigList = mWifiManager.getConfiguredNetworks(); List<WifiConfiguration> wifiConfigList = mWifiManager.getConfiguredNetworks();
log("size of wifiConfigList: " + wifiConfigList.size()); log("size of wifiConfigList: " + wifiConfigList.size());
for (WifiConfiguration wifiConfig: wifiConfigList) { for (WifiConfiguration wifiConfig: wifiConfigList) {