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

Address API Council feedback for WifiAdapter/WPS APIs

Browse Source 
This change addresses concerns from the API review. Things that
are fixed are -

1. WifiAdapter is removed, until we have 'real' support for it
2. All the methods from WifiAdapter are moved to WifiManager
3. Changed WPSListener API names to be onFailed/onSucceeded et al
4. Removed ActionListener from WPS APIs, they now take WpsListener

Bug: 16403303
Bug: 17115004
Change-Id: I609c42f08b52f77240ce9a97b1a9941a9c154752
This commit is contained in:
Vinit Deshpande
2014-08-29 13:16:40 -07:00
parent 8dade422e5
commit e0441cfc07
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/WpsDialog.java
View File

@@ -57,7 +57,7 @@ public class WpsDialog extends AlertDialog {
private static final int WPS_TIMEOUT_S = 120; private static final int WPS_TIMEOUT_S = 120;
private WifiManager mWifiManager; private WifiManager mWifiManager;
private WifiManager.WpsListener mWpsListener; private WifiManager.WpsCallback mWpsListener;
private int mWpsSetup; private int mWpsSetup;
private final IntentFilter mFilter; private final IntentFilter mFilter;
@@ -81,8 +81,9 @@ public class WpsDialog extends AlertDialog {
mContext = context; mContext = context;
mWpsSetup = wpsSetup; mWpsSetup = wpsSetup;
class WpsListener implements WifiManager.WpsListener { class WpsListener extends WifiManager.WpsCallback {
public void onStartSuccess(String pin) {
public void onStarted(String pin) {
if (pin != null) { if (pin != null) {
updateDialog(DialogState.WPS_START, String.format( updateDialog(DialogState.WPS_START, String.format(
mContext.getString(R.string.wifi_wps_onstart_pin), pin)); mContext.getString(R.string.wifi_wps_onstart_pin), pin));
@@ -91,12 +92,13 @@ public class WpsDialog extends AlertDialog {
R.string.wifi_wps_onstart_pbc)); R.string.wifi_wps_onstart_pbc));
} }
} }
public void onCompletion() {
public void onSucceeded() {
updateDialog(DialogState.WPS_COMPLETE, updateDialog(DialogState.WPS_COMPLETE,
mContext.getString(R.string.wifi_wps_complete)); mContext.getString(R.string.wifi_wps_complete));
} }
public void onFailure(int reason) { public void onFailed(int reason) {
String msg; String msg;
switch (reason) { switch (reason) {
case WifiManager.WPS_OVERLAP_ERROR: case WifiManager.WPS_OVERLAP_ERROR: