am 011b8efc: Merge "frameworks/base: stop find before issuing wps pbc."

* commit '011b8efce194529de82e94fd0c0bf29835b9f07a': frameworks/base: stop find before issuing wps pbc.
2013-03-06 08:54:49 -08:00
parent 263554ae5f 011b8efce1
commit 17d8963653
1 changed files with 2 additions and 0 deletions
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -1731,6 +1731,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
                    //Ignore more client requests
                    break;
                case PEER_CONNECTION_USER_ACCEPT:
+                    //Stop discovery to avoid failure due to channel switch
+                    mWifiNative.p2pStopFind();
                    if (mSavedPeerConfig.wps.setup == WpsInfo.PBC) {
                        mWifiNative.startWpsPbc(mGroup.getInterface(), null);
                    } else {