summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-06 22:32:04 -0700
committerIrfan Sheriff <isheriff@google.com>2011-09-06 22:32:04 -0700
commit6689200262d954014bfd612c139948efd74912b3 (patch)
treef9173dcd3db011d226acc7f0f1b6cf70bcd879fa /src/com
parentc6680fd1d490d7174e7e5bad4780186aff40214f (diff)
downloadpackages_apps_settings-6689200262d954014bfd612c139948efd74912b3.zip
packages_apps_settings-6689200262d954014bfd612c139948efd74912b3.tar.gz
packages_apps_settings-6689200262d954014bfd612c139948efd74912b3.tar.bz2
Use renamed Wps class
Bug: 5247957 Change-Id: Ib95f0411f637bcb6d43b9b963a282d4e9c4e813a
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/wifi/WifiConfigController.java8
-rw-r--r--src/com/android/settings/wifi/p2p/WifiP2pDialog.java6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8d4e77b..0ecb8a9 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -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;
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
index c345538..d6e80f5 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
@@ -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;