diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-01-16 13:02:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-16 13:02:57 -0800 |
| commit | b2c1a5c38834fd6fef229001d0571b7e833236ed (patch) | |
| tree | 4dd35e65f50bcdd9b08b07ff2924c44a565d1d0f /services/java/com | |
| parent | 749b9dbaf939ab91ae5cf6680dd03e1180a8b37f (diff) | |
| parent | e4c56c9655bf936454e2f3ee434aacb403876c7d (diff) | |
| download | frameworks_base-b2c1a5c38834fd6fef229001d0571b7e833236ed.zip frameworks_base-b2c1a5c38834fd6fef229001d0571b7e833236ed.tar.gz frameworks_base-b2c1a5c38834fd6fef229001d0571b7e833236ed.tar.bz2 | |
Merge "Fix WPS to provides immediate feedback" into honeycomb
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 1b590ba..cf07239 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -37,6 +37,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.SupplicantState; import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WpsConfiguration; +import android.net.wifi.WpsResult; import android.net.ConnectivityManager; import android.net.InterfaceConfiguration; import android.net.DhcpInfo; @@ -841,13 +842,13 @@ public class WifiService extends IWifiManager.Stub { mWifiStateMachine.forgetNetwork(netId); } - public String startWps(WpsConfiguration config) { + public WpsResult startWps(WpsConfiguration config) { enforceChangePermission(); if (mChannel != null) { return mWifiStateMachine.startWps(mChannel, config); } else { Slog.e(TAG, "mChannel is not initialized"); - return ""; + return new WpsResult(WpsResult.Status.FAILURE); } } |