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

Commit b4d5a9e7 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev

parents 71175f72 6681be27

services/java/com/android/server/display/WifiDisplayController.java

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.media.AudioManager; 
import android.media.RemoteDisplay;

import android.net.NetworkInfo;

import android.net.Uri;

import android.net.wifi.WpsInfo;

import android.net.wifi.p2p.WifiP2pConfig;

import android.net.wifi.p2p.WifiP2pDevice;

import android.net.wifi.p2p.WifiP2pDeviceList;
@@ -572,6 +573,16 @@ final class WifiDisplayController implements DumpUtils.Dump { 


            mConnectingDevice = mDesiredDevice;

            WifiP2pConfig config = new WifiP2pConfig();

            WpsInfo wps = new WpsInfo();

            if (mConnectingDevice.wpsPbcSupported()) {

                wps.setup = WpsInfo.PBC;

            } else if (mConnectingDevice.wpsDisplaySupported()) {

                // We do keypad if peer does display

                wps.setup = WpsInfo.KEYPAD;

            } else {

                wps.setup = WpsInfo.DISPLAY;

            }

            config.wps = wps;

            config.deviceAddress = mConnectingDevice.deviceAddress;

            // Helps with STA & P2P concurrency

            config.groupOwnerIntent = WifiP2pConfig.MIN_GROUP_OWNER_INTENT;