summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/WifiConfigStore.java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-06 22:17:50 -0700
committerIrfan Sheriff <isheriff@google.com>2011-09-06 22:32:58 -0700
commit489a9d81fd1458940e1ec01ba0cef36843732479 (patch)
tree870e643bc1ab71a5f82f02a74f9d9f40169c8eca /wifi/java/android/net/wifi/WifiConfigStore.java
parentdff28d5293c16ac75f6db7a1c3b78fbaad1f2f6a (diff)
downloadframeworks_base-489a9d81fd1458940e1ec01ba0cef36843732479.zip
frameworks_base-489a9d81fd1458940e1ec01ba0cef36843732479.tar.gz
frameworks_base-489a9d81fd1458940e1ec01ba0cef36843732479.tar.bz2
Rename WpsConfiguration to Wps
For the purpose of exposing the class as a storage for Wps info with p2p, it is better to just call it Wps Bug: 5247957 Change-Id: Iaebef958dd8f08fdbeb4b9d7fa5ad5527400710d
Diffstat (limited to 'wifi/java/android/net/wifi/WifiConfigStore.java')
-rw-r--r--wifi/java/android/net/wifi/WifiConfigStore.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java
index 83dda5c..c75dec7 100644
--- a/wifi/java/android/net/wifi/WifiConfigStore.java
+++ b/wifi/java/android/net/wifi/WifiConfigStore.java
@@ -397,7 +397,7 @@ class WifiConfigStore {
* Start WPS pin method configuration with pin obtained
* from the access point
*/
- static WpsResult startWpsWithPinFromAccessPoint(WpsConfiguration config) {
+ static WpsResult startWpsWithPinFromAccessPoint(Wps config) {
WpsResult result = new WpsResult();
if (WifiNative.startWpsWithPinFromAccessPointCommand(config.BSSID, config.pin)) {
/* WPS leaves all networks disabled */
@@ -415,7 +415,7 @@ class WifiConfigStore {
* from the device
* @return WpsResult indicating status and pin
*/
- static WpsResult startWpsWithPinFromDevice(WpsConfiguration config) {
+ static WpsResult startWpsWithPinFromDevice(Wps config) {
WpsResult result = new WpsResult();
result.pin = WifiNative.startWpsWithPinFromDeviceCommand(config.BSSID);
/* WPS leaves all networks disabled */
@@ -432,7 +432,7 @@ class WifiConfigStore {
/**
* Start WPS push button configuration
*/
- static WpsResult startWpsPbc(WpsConfiguration config) {
+ static WpsResult startWpsPbc(Wps config) {
WpsResult result = new WpsResult();
if (WifiNative.startWpsPbcCommand(config.BSSID)) {
/* WPS leaves all networks disabled */
@@ -594,7 +594,7 @@ class WifiConfigStore {
sendConfiguredNetworksChangedBroadcast();
}
- static void updateIpAndProxyFromWpsConfig(int netId, WpsConfiguration wpsConfig) {
+ static void updateIpAndProxyFromWpsConfig(int netId, Wps wpsConfig) {
synchronized (sConfiguredNetworks) {
WifiConfiguration config = sConfiguredNetworks.get(netId);
if (config != null) {