summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-09-18 12:22:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-18 12:22:06 -0700
commit24ed2769130a8f9df44e7fc22be52b6282e724c3 (patch)
tree6fec39a51a0f49f5bfe503b5d60afdf75c7e3ca2 /services
parent00bc4c0b6723bda12e846f9f1f729acb79a389a1 (diff)
parente0c28d5f1358fc2d4c464f910bd04fed4b283fef (diff)
downloadframeworks_base-24ed2769130a8f9df44e7fc22be52b6282e724c3.zip
frameworks_base-24ed2769130a8f9df44e7fc22be52b6282e724c3.tar.gz
frameworks_base-24ed2769130a8f9df44e7fc22be52b6282e724c3.tar.bz2
Merge "WFD fixes" into jb-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/display/WifiDisplayController.java2
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..328f687 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_GROUP_OWNER_INTENT;
final WifiDisplay display = createWifiDisplay(mConnectingDevice);
mHandler.post(new Runnable() {