Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ffc81c1 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

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

* commit '17d89636':
  frameworks/base: stop find before issuing wps pbc.
parents 7341786b 17d89636

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

+2 −0
Original line number Diff line number Diff line
@@ -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 {