Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72e95cfe authored by Xia Wang's avatar Xia Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix Wifi test" into jb-dev

parents feecf9d7 81341fee

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java

+5 −2
Original line number Diff line number Diff line
@@ -246,9 +246,7 @@ public class ConnectivityManagerTestActivity extends Activity { 


        initializeNetworkStates();



        mWifiManager.setWifiEnabled(true);

        log("Clear Wifi before we start the test.");

        sleep(SHORT_TIMEOUT);

        removeConfiguredNetworksAndDisableWifi();

        mWifiRegexs = mCM.getTetherableWifiRegexs();

     }
@@ -645,6 +643,11 @@ public class ConnectivityManagerTestActivity extends Activity { 
     */

    public boolean disconnectAP() {

        // remove saved networks

        if (!mWifiManager.isWifiEnabled()) {

            log("Enabled wifi before remove configured networks");

            mWifiManager.setWifiEnabled(true);

            sleep(SHORT_TIMEOUT);

        }

        List<WifiConfiguration> wifiConfigList = mWifiManager.getConfiguredNetworks();

        log("size of wifiConfigList: " + wifiConfigList.size());

        for (WifiConfiguration wifiConfig: wifiConfigList) {