Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 054e3a1a authored by Dave Burke's avatar Dave Burke Committed by Android Git Automerger
Browse files

am 08980a1f: am 049dd8e6: Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 

* commit '08980a1f':
  Revert "Specify max go intent for wifi display"
parents 03f2abec 08980a1f

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

+0 −2
Original line number Diff line number Diff line
@@ -485,8 +485,6 @@ 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() {

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

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ public class WifiP2pConfig implements Parcelable { 
     */

    public WpsInfo wps;



    /** @hide */

    public static final int MAX_GO_INTENT   =   15;



    /**

     * This is an integer value between 0 and 15 where 0 indicates the least

     * inclination to be a group owner and 15 indicates the highest inclination