Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev

Browse Source
This commit is contained in:
Andreas Huber
2012-09-10 11:41:23 -07:00
committed by Android (Google) Code Review
parent 1434e29ac6 5e0cc0d7ab
commit dcc036c544
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,8 +493,13 @@ final class WifiDisplayController implements DumpUtils.Dump {
return; // done return; // done
} }
WifiP2pWfdInfo wfdInfo = mConnectedDevice.wfdInfo; int port = DEFAULT_CONTROL_PORT;
int port = (wfdInfo != null ? wfdInfo.getControlPort() : DEFAULT_CONTROL_PORT); if (mConnectedDevice.deviceName.startsWith("DIRECT-")
&& mConnectedDevice.deviceName.endsWith("Broadcom")) {
// These dongles ignore the port we broadcast in our WFD IE.
port = 8554;
}
final WifiDisplay display = createWifiDisplay(mConnectedDevice); final WifiDisplay display = createWifiDisplay(mConnectedDevice);
final String iface = addr.getHostAddress() + ":" + port; final String iface = addr.getHostAddress() + ":" + port;