diff options
| author | Andreas Huber <andih@google.com> | 2012-09-10 11:41:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 11:41:23 -0700 |
| commit | dcc036c54457943afeadf40922a9dacfe29f30e1 (patch) | |
| tree | 6d1ced331d9fc227fec3a621f7ece67662c439a5 | |
| parent | 1434e29ac6a157130c9882606ca577567c91ddc4 (diff) | |
| parent | 5e0cc0d7ab29e5fbd11316cd3147ef96d65f8de7 (diff) | |
| download | frameworks_base-dcc036c54457943afeadf40922a9dacfe29f30e1.zip frameworks_base-dcc036c54457943afeadf40922a9dacfe29f30e1.tar.gz frameworks_base-dcc036c54457943afeadf40922a9dacfe29f30e1.tar.bz2 | |
Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/display/WifiDisplayController.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java index b617d00..67691df 100644 --- a/services/java/com/android/server/display/WifiDisplayController.java +++ b/services/java/com/android/server/display/WifiDisplayController.java @@ -493,8 +493,13 @@ final class WifiDisplayController implements DumpUtils.Dump { return; // done } - WifiP2pWfdInfo wfdInfo = mConnectedDevice.wfdInfo; - int port = (wfdInfo != null ? wfdInfo.getControlPort() : DEFAULT_CONTROL_PORT); + int port = 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 String iface = addr.getHostAddress() + ":" + port; |