commit 0ffc81c1ada65b4ef4febaacf044e9fa62309b87
author Irfan Sheriff <isheriff@android.com> Wed Mar 06 17:44:42 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 06 17:44:42 2013 +0000
tree 8c8393b4bff5c984575776885f92adc35f942874
parent 7341786b138cb52eac053108b524ea3296d40f6d
parent 17d89636530f4a5e4e77d3ae11e2e696a697cc64

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

* commit '17d89636530f4a5e4e77d3ae11e2e696a697cc64':
  frameworks/base: stop find before issuing wps pbc.

wifi/java/android/net/wifi/p2p/WifiP2pService.java

diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
index 4a489d5..e6a1df1 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -1745,6 +1745,8 @@
                     //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 {