diff options
Diffstat (limited to 'core')
4 files changed, 39 insertions, 8 deletions
diff --git a/core/java/com/android/internal/util/Protocol.java b/core/java/com/android/internal/util/Protocol.java index 0cadb16..d462d7f 100644 --- a/core/java/com/android/internal/util/Protocol.java +++ b/core/java/com/android/internal/util/Protocol.java @@ -44,6 +44,7 @@ public class Protocol { public static final int BASE_WIFI_P2P_MANAGER = 0x00022000; public static final int BASE_WIFI_P2P_SERVICE = 0x00023000; public static final int BASE_WIFI_MONITOR = 0x00024000; + public static final int BASE_WIFI_MANAGER = 0x00025000; public static final int BASE_DHCP = 0x00030000; public static final int BASE_DATA_CONNECTION = 0x00040000; public static final int BASE_DATA_CONNECTION_AC = 0x00041000; 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(); diff --git a/core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java b/core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java index 8d778c4..e799d15 100644 --- a/core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java +++ b/core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java @@ -74,6 +74,7 @@ public class ConnectionUtil { private int mWifiState; private NetworkInfo mWifiNetworkInfo; private WifiManager mWifiManager; + private WifiManager.Channel mChannel; private Context mContext; // Verify connectivity state private static final int NUM_NETWORK_TYPES = ConnectivityManager.MAX_NETWORK_TYPE + 1; @@ -114,7 +115,7 @@ public class ConnectionUtil { // Get an instance of WifiManager mWifiManager =(WifiManager)mContext.getSystemService(Context.WIFI_SERVICE); - mWifiManager.asyncConnect(mContext, new WifiServiceHandler()); + mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null); mDownloadManager = (DownloadManager)mContext.getSystemService(Context.DOWNLOAD_SERVICE); @@ -567,7 +568,14 @@ public class ConnectionUtil { Log.v(LOG_TAG, "Found " + ssid + " in the scan result list."); Log.v(LOG_TAG, "Retry: " + retry); foundApInScanResults = true; - mWifiManager.connectNetwork(config); + mWifiManager.connect(mChannel, config, new WifiManager.ActionListener() { + public void onSuccess() { + } + public void onFailure(int reason) { + Log.e(LOG_TAG, "connect failed " + reason); + } + }); + break; } } @@ -614,7 +622,13 @@ public class ConnectionUtil { for (WifiConfiguration wifiConfig: wifiConfigList) { Log.v(LOG_TAG, "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.e(LOG_TAG, "forget failed " + reason); + } + }); } return true; } @@ -723,4 +737,4 @@ public class ConnectionUtil { } return false; } -}
\ No newline at end of file +} |