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

Merge "Use renamed Wps class"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-09-07 10:53:56 -07:00
committed by Android (Google) Code Review
parent 491af0805d 6689200262
commit 84fbf2b8dd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -33,8 +33,8 @@ import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.net.wifi.WifiConfiguration.ProxySettings;
import android.net.wifi.WifiConfiguration.Status;
import android.net.wifi.WifiInfo;
import android.net.wifi.WpsConfiguration;
import android.net.wifi.WpsConfiguration.Setup;
import android.net.wifi.Wps;
import android.net.wifi.Wps.Setup;
import android.security.Credentials;
import android.security.KeyStore;
import android.text.Editable;
@@ -484,8 +484,8 @@ public class WifiConfigController implements TextWatcher,
return MANUAL;
}
WpsConfiguration getWpsConfig() {
WpsConfiguration config = new WpsConfiguration();
Wps getWpsConfig() {
Wps config = new Wps();
switch (mNetworkSetupSpinner.getSelectedItemPosition()) {
case WPS_PBC:
config.setup = Setup.PBC;

6
src/com/android/settings/wifi/p2p/WifiP2pDialog.java
View File

@@ -19,8 +19,8 @@ package com.android.settings.wifi.p2p;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.net.wifi.WpsConfiguration;
import android.net.wifi.WpsConfiguration.Setup;
import android.net.wifi.Wps;
import android.net.wifi.Wps.Setup;
import android.net.wifi.p2p.WifiP2pConfig;
import android.net.wifi.p2p.WifiP2pDevice;
import android.os.Bundle;
@@ -64,7 +64,7 @@ public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSele
public WifiP2pConfig getConfig() {
WifiP2pConfig config = new WifiP2pConfig();
config.deviceAddress = mDeviceAddress.getText().toString();
config.wpsConfig = new WpsConfiguration();
config.wpsConfig = new Wps();
switch (mWpsSetupIndex) {
case WPS_PBC:
config.wpsConfig.setup = Setup.PBC;