commit 029dffbd5cefa3396a7c6acc6ff9650a068923b7
author Irfan Sheriff <isheriff@google.com> Wed Dec 21 09:26:51 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 21 09:26:51 2011 -0800
tree 12f7ad1257fc43374580d4189482cb2883865720
parent e6924090f1a787218a1e59f0077134e86233c1a9
parent 1e13143b3a40405a0e61d2b9219710e445878e43

Merge "Add debug support for P2P WPS"

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index f09e4eb..cf3b303 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.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 @@
             } 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() {