From 5cd1bbda7d5f13d36a8d0144ed5310064a760bee Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Tue, 10 Jul 2012 11:42:55 -0700 Subject: [PATCH] Use updated WifiManager API Change-Id: Ia02fc8a7eafa84fa4eddeeefafa7fecaac82903e --- .../android/settings/wifi/WifiSettings.java | 22 +++++++++---------- .../wifi/WifiSettingsForSetupWizardXL.java | 7 ++---- src/com/android/settings/wifi/WpsDialog.java | 6 ++--- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index de42f2a4847..058dd8acda1 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -114,7 +114,6 @@ public class WifiSettings extends SettingsPreferenceFragment private final Scanner mScanner; private WifiManager mWifiManager; - private WifiManager.Channel mChannel; private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mSaveListener; private WifiManager.ActionListener mForgetListener; @@ -243,7 +242,6 @@ public class WifiSettings extends SettingsPreferenceFragment mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); - mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null); mConnectListener = new WifiManager.ActionListener() { public void onSuccess() { @@ -373,7 +371,7 @@ public class WifiSettings extends SettingsPreferenceFragment getActivity().registerReceiver(mReceiver, mFilter); if (mKeyStoreNetworkId != INVALID_NETWORK_ID && KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) { - mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener); + mWifiManager.connect(mKeyStoreNetworkId, mConnectListener); } mKeyStoreNetworkId = INVALID_NETWORK_ID; @@ -520,13 +518,13 @@ public class WifiSettings extends SettingsPreferenceFragment case MENU_ID_CONNECT: { if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) { if (!requireKeyStore(mSelectedAccessPoint.getConfig())) { - mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId, + mWifiManager.connect(mSelectedAccessPoint.networkId, mConnectListener); } } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) { /** Bypass dialog for unsecured networks */ mSelectedAccessPoint.generateOpenNetworkConfig(); - mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), + mWifiManager.connect(mSelectedAccessPoint.getConfig(), mConnectListener); } else { showDialog(mSelectedAccessPoint, true); @@ -534,7 +532,7 @@ public class WifiSettings extends SettingsPreferenceFragment return true; } case MENU_ID_FORGET: { - mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener); + mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener); return true; } case MENU_ID_MODIFY: { @@ -553,7 +551,7 @@ public class WifiSettings extends SettingsPreferenceFragment if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE && mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) { mSelectedAccessPoint.generateOpenNetworkConfig(); - mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mConnectListener); + mWifiManager.connect(mSelectedAccessPoint.getConfig(), mConnectListener); } else { showDialog(mSelectedAccessPoint, false); } @@ -863,18 +861,18 @@ public class WifiSettings extends SettingsPreferenceFragment if (mSelectedAccessPoint != null && !requireKeyStore(mSelectedAccessPoint.getConfig()) && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) { - mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId, + mWifiManager.connect(mSelectedAccessPoint.networkId, mConnectListener); } } else if (config.networkId != INVALID_NETWORK_ID) { if (mSelectedAccessPoint != null) { - mWifiManager.save(mChannel, config, mSaveListener); + mWifiManager.save(config, mSaveListener); } } else { if (configController.isEdit() || requireKeyStore(config)) { - mWifiManager.save(mChannel, config, mSaveListener); + mWifiManager.save(config, mSaveListener); } else { - mWifiManager.connect(mChannel, config, mConnectListener); + mWifiManager.connect(config, mConnectListener); } } @@ -891,7 +889,7 @@ public class WifiSettings extends SettingsPreferenceFragment return; } - mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener); + mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener); if (mWifiManager.isWifiEnabled()) { mScanner.resume(); diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index 8258b5553d9..bc387cb2c29 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java @@ -38,7 +38,6 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.internal.util.AsyncChannel; import com.android.settings.R; import java.util.Collection; @@ -74,7 +73,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis private WifiSettings mWifiSettings; private WifiManager mWifiManager; - private WifiManager.Channel mChannel; /** Used for resizing a padding above title. Hiden when software keyboard is shown. */ private View mTopPadding; @@ -143,7 +141,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis setContentView(R.layout.wifi_settings_for_setup_wizard_xl); mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE); - mChannel = mWifiManager.initialize(this, getMainLooper(), null); // There's no button here enabling wifi network, so we need to enable it without // users' request. mWifiManager.setWifiEnabled(true); @@ -596,7 +593,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)", config.SSID, config.networkId)); } - mWifiManager.forget(mChannel, config.networkId, new WifiManager.ActionListener() { + mWifiManager.forget(config.networkId, new WifiManager.ActionListener() { public void onSuccess() { } public void onFailure(int reason) { @@ -761,7 +758,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis */ /* package */ void onSaveNetwork(WifiConfiguration config) { // We want to both save and connect a network. connectNetwork() does both. - mWifiManager.connect(mChannel, config, new WifiManager.ActionListener() { + mWifiManager.connect(config, new WifiManager.ActionListener() { public void onSuccess() { } public void onFailure(int reason) { diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java index 40b2a35b9c1..b5b48baee8a 100644 --- a/src/com/android/settings/wifi/WpsDialog.java +++ b/src/com/android/settings/wifi/WpsDialog.java @@ -56,7 +56,6 @@ public class WpsDialog extends AlertDialog { private static final int WPS_TIMEOUT_S = 120; private WifiManager mWifiManager; - private WifiManager.Channel mChannel; private WifiManager.WpsListener mWpsListener; private int mWpsSetup; @@ -155,7 +154,6 @@ public class WpsDialog extends AlertDialog { }); mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); - mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null); setView(mView); super.onCreate(savedInstanceState); @@ -184,13 +182,13 @@ public class WpsDialog extends AlertDialog { WpsInfo wpsConfig = new WpsInfo(); wpsConfig.setup = mWpsSetup; - mWifiManager.startWps(mChannel, wpsConfig, mWpsListener); + mWifiManager.startWps(wpsConfig, mWpsListener); } @Override protected void onStop() { if (mDialogState != DialogState.WPS_COMPLETE) { - mWifiManager.cancelWps(mChannel, null); + mWifiManager.cancelWps(null); } if (mReceiver != null) {