PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use updated WifiManager API"

Browse Source
This commit is contained in:
Irfan Sheriff
2012-07-25 12:25:42 -07:00
committed by Android (Google) Code Review
parent fbf500877a 5cd1bbda7d
commit 0cd75608c0
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -114,7 +114,6 @@ public class WifiSettings extends SettingsPreferenceFragment
private final Scanner mScanner; private final Scanner mScanner;
private WifiManager mWifiManager; private WifiManager mWifiManager;
private WifiManager.Channel mChannel;
private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mConnectListener;
private WifiManager.ActionListener mSaveListener; private WifiManager.ActionListener mSaveListener;
private WifiManager.ActionListener mForgetListener; private WifiManager.ActionListener mForgetListener;
@@ -243,7 +242,6 @@ public class WifiSettings extends SettingsPreferenceFragment
mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT); mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null);
mConnectListener = new WifiManager.ActionListener() { mConnectListener = new WifiManager.ActionListener() {
public void onSuccess() { public void onSuccess() {
@@ -373,7 +371,7 @@ public class WifiSettings extends SettingsPreferenceFragment
getActivity().registerReceiver(mReceiver, mFilter); getActivity().registerReceiver(mReceiver, mFilter);
if (mKeyStoreNetworkId != INVALID_NETWORK_ID && if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) { KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener); mWifiManager.connect(mKeyStoreNetworkId, mConnectListener);
} }
mKeyStoreNetworkId = INVALID_NETWORK_ID; mKeyStoreNetworkId = INVALID_NETWORK_ID;
@@ -520,13 +518,13 @@ public class WifiSettings extends SettingsPreferenceFragment
case MENU_ID_CONNECT: { case MENU_ID_CONNECT: {
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) { if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
if (!requireKeyStore(mSelectedAccessPoint.getConfig())) { if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId, mWifiManager.connect(mSelectedAccessPoint.networkId,
mConnectListener); mConnectListener);
} }
} else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) { } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
/** Bypass dialog for unsecured networks */ /** Bypass dialog for unsecured networks */
mSelectedAccessPoint.generateOpenNetworkConfig(); mSelectedAccessPoint.generateOpenNetworkConfig();
mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mWifiManager.connect(mSelectedAccessPoint.getConfig(),
mConnectListener); mConnectListener);
} else { } else {
showDialog(mSelectedAccessPoint, true); showDialog(mSelectedAccessPoint, true);
@@ -534,7 +532,7 @@ public class WifiSettings extends SettingsPreferenceFragment
return true; return true;
} }
case MENU_ID_FORGET: { case MENU_ID_FORGET: {
mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener); mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
return true; return true;
} }
case MENU_ID_MODIFY: { case MENU_ID_MODIFY: {
@@ -553,7 +551,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE && if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) { mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
mSelectedAccessPoint.generateOpenNetworkConfig(); mSelectedAccessPoint.generateOpenNetworkConfig();
mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mConnectListener); mWifiManager.connect(mSelectedAccessPoint.getConfig(), mConnectListener);
} else { } else {
showDialog(mSelectedAccessPoint, false); showDialog(mSelectedAccessPoint, false);
} }
@@ -863,18 +861,18 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mSelectedAccessPoint != null if (mSelectedAccessPoint != null
&& !requireKeyStore(mSelectedAccessPoint.getConfig()) && !requireKeyStore(mSelectedAccessPoint.getConfig())
&& mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) { && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId, mWifiManager.connect(mSelectedAccessPoint.networkId,
mConnectListener); mConnectListener);
} }
} else if (config.networkId != INVALID_NETWORK_ID) { } else if (config.networkId != INVALID_NETWORK_ID) {
if (mSelectedAccessPoint != null) { if (mSelectedAccessPoint != null) {
mWifiManager.save(mChannel, config, mSaveListener); mWifiManager.save(config, mSaveListener);
} }
} else { } else {
if (configController.isEdit() || requireKeyStore(config)) { if (configController.isEdit() || requireKeyStore(config)) {
mWifiManager.save(mChannel, config, mSaveListener); mWifiManager.save(config, mSaveListener);
} else { } else {
mWifiManager.connect(mChannel, config, mConnectListener); mWifiManager.connect(config, mConnectListener);
} }
} }
@@ -891,7 +889,7 @@ public class WifiSettings extends SettingsPreferenceFragment
return; return;
} }
mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener); mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
if (mWifiManager.isWifiEnabled()) { if (mWifiManager.isWifiEnabled()) {
mScanner.resume(); mScanner.resume();

7
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -38,7 +38,6 @@ import android.widget.Button;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.util.AsyncChannel;
import com.android.settings.R; import com.android.settings.R;
import java.util.Collection; import java.util.Collection;
@@ -74,7 +73,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
private WifiSettings mWifiSettings; private WifiSettings mWifiSettings;
private WifiManager mWifiManager; private WifiManager mWifiManager;
private WifiManager.Channel mChannel;
/** Used for resizing a padding above title. Hiden when software keyboard is shown. */ /** Used for resizing a padding above title. Hiden when software keyboard is shown. */
private View mTopPadding; private View mTopPadding;
@@ -143,7 +141,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
setContentView(R.layout.wifi_settings_for_setup_wizard_xl); setContentView(R.layout.wifi_settings_for_setup_wizard_xl);
mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE); 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 // There's no button here enabling wifi network, so we need to enable it without
// users' request. // users' request.
mWifiManager.setWifiEnabled(true); 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)", Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
config.SSID, config.networkId)); config.SSID, config.networkId));
} }
mWifiManager.forget(mChannel, config.networkId, new WifiManager.ActionListener() { mWifiManager.forget(config.networkId, new WifiManager.ActionListener() {
public void onSuccess() { public void onSuccess() {
} }
public void onFailure(int reason) { public void onFailure(int reason) {
@@ -761,7 +758,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
*/ */
/* package */ void onSaveNetwork(WifiConfiguration config) { /* package */ void onSaveNetwork(WifiConfiguration config) {
// We want to both save and connect a network. connectNetwork() does both. // 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 onSuccess() {
} }
public void onFailure(int reason) { public void onFailure(int reason) {

6
src/com/android/settings/wifi/WpsDialog.java
View File

@@ -56,7 +56,6 @@ public class WpsDialog extends AlertDialog {
private static final int WPS_TIMEOUT_S = 120; private static final int WPS_TIMEOUT_S = 120;
private WifiManager mWifiManager; private WifiManager mWifiManager;
private WifiManager.Channel mChannel;
private WifiManager.WpsListener mWpsListener; private WifiManager.WpsListener mWpsListener;
private int mWpsSetup; private int mWpsSetup;
@@ -155,7 +154,6 @@ public class WpsDialog extends AlertDialog {
}); });
mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null);
setView(mView); setView(mView);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -184,13 +182,13 @@ public class WpsDialog extends AlertDialog {
WpsInfo wpsConfig = new WpsInfo(); WpsInfo wpsConfig = new WpsInfo();
wpsConfig.setup = mWpsSetup; wpsConfig.setup = mWpsSetup;
mWifiManager.startWps(mChannel, wpsConfig, mWpsListener); mWifiManager.startWps(wpsConfig, mWpsListener);
} }
@Override @Override
protected void onStop() { protected void onStop() {
if (mDialogState != DialogState.WPS_COMPLETE) { if (mDialogState != DialogState.WPS_COMPLETE) {
mWifiManager.cancelWps(mChannel, null); mWifiManager.cancelWps(null);
} }
if (mReceiver != null) { if (mReceiver != null) {