diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-09-17 17:37:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-17 17:37:48 -0700 |
| commit | 218e2f199b9ba568a815d64269ea0784e2d32935 (patch) | |
| tree | 867a79404401c814fc3129759519d8328bdefced /services/java | |
| parent | f1aa107b183189d65315d152148dc96b48f6e4b0 (diff) | |
| parent | 7ab7260697de617aced0b0ba594304a42e5395bd (diff) | |
| download | frameworks_base-218e2f199b9ba568a815d64269ea0784e2d32935.zip frameworks_base-218e2f199b9ba568a815d64269ea0784e2d32935.tar.gz frameworks_base-218e2f199b9ba568a815d64269ea0784e2d32935.tar.bz2 | |
Merge "Specify max go intent for wifi display" into jb-mr1-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/display/WifiDisplayController.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java index 87e11e6..3bc19a1 100644 --- a/services/java/com/android/server/display/WifiDisplayController.java +++ b/services/java/com/android/server/display/WifiDisplayController.java @@ -485,6 +485,8 @@ final class WifiDisplayController implements DumpUtils.Dump { mConnectingDevice = mDesiredDevice; WifiP2pConfig config = new WifiP2pConfig(); config.deviceAddress = mConnectingDevice.deviceAddress; + // Helps with STA & P2P concurrency + config.groupOwnerIntent = WifiP2pConfig.MAX_GO_INTENT; final WifiDisplay display = createWifiDisplay(mConnectingDevice); mHandler.post(new Runnable() { |