drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Irfan Sheriff
2013-03-06 15:58:41 +00:00
committed by Gerrit Code Review
parent 7d4e52baee 575bb45e9d
commit 011b8efce1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@ -1731,6 +1731,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
//Ignore more client requests //Ignore more client requests
break; break;
case PEER_CONNECTION_USER_ACCEPT: case PEER_CONNECTION_USER_ACCEPT:
//Stop discovery to avoid failure due to channel switch
mWifiNative.p2pStopFind();
if (mSavedPeerConfig.wps.setup == WpsInfo.PBC) { if (mSavedPeerConfig.wps.setup == WpsInfo.PBC) {
mWifiNative.startWpsPbc(mGroup.getInterface(), null); mWifiNative.startWpsPbc(mGroup.getInterface(), null);
} else { } else {