Merge "Update settings from API cleanup"

This commit is contained in:
Irfan Sheriff
2011-09-07 11:28:53 -07:00
committed by Android (Google) Code Review

View File

@@ -64,21 +64,21 @@ public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSele
public WifiP2pConfig getConfig() { public WifiP2pConfig getConfig() {
WifiP2pConfig config = new WifiP2pConfig(); WifiP2pConfig config = new WifiP2pConfig();
config.deviceAddress = mDeviceAddress.getText().toString(); config.deviceAddress = mDeviceAddress.getText().toString();
config.wpsConfig = new Wps(); config.wps = new Wps();
switch (mWpsSetupIndex) { switch (mWpsSetupIndex) {
case WPS_PBC: case WPS_PBC:
config.wpsConfig.setup = Setup.PBC; config.wps.setup = Setup.PBC;
break; break;
case WPS_KEYPAD: case WPS_KEYPAD:
config.wpsConfig.setup = Setup.KEYPAD; config.wps.setup = Setup.KEYPAD;
config.wpsConfig.pin = ((TextView) mView.findViewById(R.id.wps_pin)). config.wps.pin = ((TextView) mView.findViewById(R.id.wps_pin)).
getText().toString(); getText().toString();
break; break;
case WPS_DISPLAY: case WPS_DISPLAY:
config.wpsConfig.setup = Setup.DISPLAY; config.wps.setup = Setup.DISPLAY;
break; break;
default: default:
config.wpsConfig.setup = Setup.PBC; config.wps.setup = Setup.PBC;
break; break;
} }
return config; return config;