commit 957fadc5001be0f0b4d004dbed8c57b6e1f5b46a
author Irfan Sheriff <isheriff@google.com> Thu Sep 20 18:05:22 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 20 18:05:22 2012 -0700
tree 3e32409cc3830aa2a34eb7732fe0fad5f016a801
parent da6f7ab34c23a6cbe31734e5d562baa224e3d3d6
parent 99766cf40ed706aad36032f2107fb0c1e54fc398

Merge "Use min group owner intent for concurrency" into jb-mr1-dev

services/java/com/android/server/display/WifiDisplayController.java

diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java
index 84f4e83..58f0445 100644
--- a/services/java/com/android/server/display/WifiDisplayController.java
+++ b/services/java/com/android/server/display/WifiDisplayController.java
@@ -536,7 +536,7 @@
             WifiP2pConfig config = new WifiP2pConfig();
             config.deviceAddress = mConnectingDevice.deviceAddress;
             // Helps with STA & P2P concurrency
-            config.groupOwnerIntent = WifiP2pConfig.MAX_GROUP_OWNER_INTENT;
+            config.groupOwnerIntent = WifiP2pConfig.MIN_GROUP_OWNER_INTENT;
 
             WifiDisplay display = createWifiDisplay(mConnectingDevice);
             advertiseDisplay(display, null, 0, 0, 0);

wifi/java/android/net/wifi/p2p/WifiP2pConfig.java

diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java
index f4440c8..b1501ed 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java
@@ -39,6 +39,8 @@
 
     /** @hide */
     public static final int MAX_GROUP_OWNER_INTENT   =   15;
+    /** @hide */
+    public static final int MIN_GROUP_OWNER_INTENT   =   0;
 
     /**
      * This is an integer value between 0 and 15 where 0 indicates the least