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

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

Browse Source
This commit is contained in:
Irfan Sheriff
2012-11-28 16:28:40 -08:00
committed by Android (Google) Code Review
parent 71175f727b 6681be2787
commit b4d5a9e73b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/display/WifiDisplayController.java
View File

@ -30,6 +30,7 @@ import android.media.AudioManager;
import android.media.RemoteDisplay; import android.media.RemoteDisplay;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.net.wifi.WpsInfo;
import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pConfig;
import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pDevice;
import android.net.wifi.p2p.WifiP2pDeviceList; import android.net.wifi.p2p.WifiP2pDeviceList;
@ -572,6 +573,16 @@ final class WifiDisplayController implements DumpUtils.Dump {
mConnectingDevice = mDesiredDevice; mConnectingDevice = mDesiredDevice;
WifiP2pConfig config = new WifiP2pConfig(); 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; config.deviceAddress = mConnectingDevice.deviceAddress;
// Helps with STA & P2P concurrency // Helps with STA & P2P concurrency
config.groupOwnerIntent = WifiP2pConfig.MIN_GROUP_OWNER_INTENT; config.groupOwnerIntent = WifiP2pConfig.MIN_GROUP_OWNER_INTENT;