From 1e13143b3a40405a0e61d2b9219710e445878e43 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 19 Dec 2011 16:26:29 -0800 Subject: [PATCH] Add debug support for P2P WPS Use a system property to allow WPS selection for p2p connection Change-Id: I34af97eaa4c4d4ff2e7ed52ba8f9bfb21f7b1c45 --- .../settings/wifi/p2p/WifiP2pSettings.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index f09e4eb4534..cf3b3034416 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -35,6 +35,7 @@ import android.net.wifi.p2p.WifiP2pManager.PeerListListener; import android.net.wifi.WpsInfo; import android.os.Bundle; import android.os.Handler; +import android.os.SystemProperties; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceCategory; @@ -259,13 +260,21 @@ public class WifiP2pSettings extends SettingsPreferenceFragment } else { WifiP2pConfig config = new WifiP2pConfig(); config.deviceAddress = mSelectedWifiPeer.device.deviceAddress; - if (mSelectedWifiPeer.device.wpsPbcSupported()) { - config.wps.setup = WpsInfo.PBC; - } else if (mSelectedWifiPeer.device.wpsKeypadSupported()) { - config.wps.setup = WpsInfo.KEYPAD; + + int forceWps = SystemProperties.getInt("wifidirect.wps", -1); + + if (forceWps != -1) { + config.wps.setup = forceWps; } 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, new WifiP2pManager.ActionListener() { public void onSuccess() {