diff options
Diffstat (limited to 'core/tests/ConnectivityManagerTest')
2 files changed, 20 insertions, 4 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java index d375d4c..259f15f 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java @@ -94,6 +94,7 @@ public class ConnectivityManagerTestActivity extends Activity { * Control Wifi States */ public WifiManager mWifiManager; + public WifiManager.Channel mChannel; /* * Verify connectivity state @@ -240,7 +241,7 @@ public class ConnectivityManagerTestActivity extends Activity { mCM = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); // Get an instance of WifiManager mWifiManager =(WifiManager)getSystemService(Context.WIFI_SERVICE); - mWifiManager.asyncConnect(this, new WifiServiceHandler()); + mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null); initializeNetworkStates(); @@ -594,7 +595,14 @@ public class ConnectivityManagerTestActivity extends Activity { log("found " + ssid + " in the scan result list"); log("retry: " + retry); foundApInScanResults = true; - mWifiManager.connectNetwork(config); + mWifiManager.connect(mChannel, config, + new WifiManager.ActionListener() { + public void onSuccess() { + } + public void onFailure(int reason) { + log("connect failure " + reason); + } + }); break; } } @@ -641,7 +649,13 @@ public class ConnectivityManagerTestActivity extends Activity { for (WifiConfiguration wifiConfig: wifiConfigList) { log("remove wifi configuration: " + wifiConfig.networkId); int netId = wifiConfig.networkId; - mWifiManager.forgetNetwork(netId); + mWifiManager.forget(mChannel, netId, new WifiManager.ActionListener() { + public void onSuccess() { + } + public void onFailure(int reason) { + log("Failed to forget " + reason); + } + }); } return true; } diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiConnectionTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiConnectionTest.java index d33a445..8d73bc0 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiConnectionTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiConnectionTest.java @@ -63,6 +63,7 @@ public class WifiConnectionTest private ConnectivityManagerTestActivity mAct; private ConnectivityManagerTestRunner mRunner; private WifiManager mWifiManager = null; + private WifiManager.Channel mChannel; private Set<WifiConfiguration> enabledNetworks = null; public WifiConnectionTest() { @@ -76,7 +77,8 @@ public class WifiConnectionTest mWifiManager = (WifiManager) mRunner.getContext().getSystemService(Context.WIFI_SERVICE); mAct = getActivity(); - mWifiManager.asyncConnect(mAct, new WifiServiceHandler()); + mChannel = mWifiManager.initialize(mAct, mAct.getMainLooper(), null); + networks = mAct.loadNetworkConfigurations(); if (DEBUG) { printNetworkConfigurations(); |