diff options
| author | Irfan Sheriff <isheriff@android.com> | 2013-03-06 17:44:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-06 17:44:42 +0000 |
| commit | 0ffc81c1ada65b4ef4febaacf044e9fa62309b87 (patch) | |
| tree | 8c8393b4bff5c984575776885f92adc35f942874 /wifi/java/android | |
| parent | 7341786b138cb52eac053108b524ea3296d40f6d (diff) | |
| parent | 17d89636530f4a5e4e77d3ae11e2e696a697cc64 (diff) | |
| download | frameworks_base-0ffc81c1ada65b4ef4febaacf044e9fa62309b87.zip frameworks_base-0ffc81c1ada65b4ef4febaacf044e9fa62309b87.tar.gz frameworks_base-0ffc81c1ada65b4ef4febaacf044e9fa62309b87.tar.bz2 | |
am 17d89636: am 011b8efc: Merge "frameworks/base: stop find before issuing wps pbc."
* commit '17d89636530f4a5e4e77d3ae11e2e696a697cc64':
frameworks/base: stop find before issuing wps pbc.
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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 { |