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

Merge "Add debug support for P2P WPS"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-12-21 09:26:51 -08:00
committed by Android (Google) Code Review
parent e6924090f1 1e13143b3a
commit 029dffbd5c
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -35,6 +35,7 @@ import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
import android.net.wifi.WpsInfo; import android.net.wifi.WpsInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.SystemProperties;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
@@ -259,13 +260,21 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
} else { } else {
WifiP2pConfig config = new WifiP2pConfig(); WifiP2pConfig config = new WifiP2pConfig();
config.deviceAddress = mSelectedWifiPeer.device.deviceAddress; config.deviceAddress = mSelectedWifiPeer.device.deviceAddress;
if (mSelectedWifiPeer.device.wpsPbcSupported()) {
config.wps.setup = WpsInfo.PBC; int forceWps = SystemProperties.getInt("wifidirect.wps", -1);
} else if (mSelectedWifiPeer.device.wpsKeypadSupported()) {
config.wps.setup = WpsInfo.KEYPAD; if (forceWps != -1) {
config.wps.setup = forceWps;
} else { } else {
config.wps.setup = WpsInfo.DISPLAY; if (mSelectedWifiPeer.device.wpsPbcSupported()) {
config.wps.setup = WpsInfo.PBC;
} else if (mSelectedWifiPeer.device.wpsKeypadSupported()) {
config.wps.setup = WpsInfo.KEYPAD;
} else {
config.wps.setup = WpsInfo.DISPLAY;
}
} }
mWifiP2pManager.connect(mChannel, config, mWifiP2pManager.connect(mChannel, config,
new WifiP2pManager.ActionListener() { new WifiP2pManager.ActionListener() {
public void onSuccess() { public void onSuccess() {