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

Author: isheriff

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

@@ -536,7 +536,7 @@ private void next() {
             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

@@ -39,6 +39,8 @@ public class WifiP2pConfig implements Parcelable {
 
     /** @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