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

Commit b637322f authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am a80b9954: am 10c29234: am 13fd8919: Merge "Fixed typo and space." 

* commit 'a80b9954':
  Fixed typo and space.
parents f6e7b208 a80b9954

wifi/java/android/net/wifi/WifiStateMachine.java

+13 −13
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class WifiStateMachine extends StateMachine { 
    private final boolean mBackgroundScanSupported;



    private String mInterfaceName;

    /* Tethering interface could be seperate from wlan interface */

    /* Tethering interface could be separate from wlan interface */

    private String mTetherInterfaceName;



    private int mLastSignalLevel = -1;
@@ -249,7 +249,7 @@ public class WifiStateMachine extends StateMachine { 
    static final int CMD_START_DRIVER                     = BASE + 13;

    /* Stop the driver */

    static final int CMD_STOP_DRIVER                      = BASE + 14;

    /* Indicates Static IP succeded */

    /* Indicates Static IP succeeded */

    static final int CMD_STATIC_IP_SUCCESS                = BASE + 15;

    /* Indicates Static IP failed */

    static final int CMD_STATIC_IP_FAILURE                = BASE + 16;
@@ -264,7 +264,7 @@ public class WifiStateMachine extends StateMachine { 


    /* Start the soft access point */

    static final int CMD_START_AP                         = BASE + 21;

    /* Indicates soft ap start succeded */

    /* Indicates soft ap start succeeded */

    static final int CMD_START_AP_SUCCESS                 = BASE + 22;

    /* Indicates soft ap start failed */

    static final int CMD_START_AP_FAILURE                 = BASE + 23;

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+40 −40
Original line number Diff line number Diff line
@@ -166,11 +166,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
    /* Commands to the WifiStateMachine */

    public static final int P2P_CONNECTION_CHANGED          =   BASE + 11;



    /* These commands are used to tempoarily disconnect wifi when we detect

    /* These commands are used to temporarily disconnect wifi when we detect

     * a frequency conflict which would make it impossible to have with p2p

     * and wifi active at the same time.

     *

     * If the user chooses to disable wifi tempoarily, we keep wifi disconnected

     * If the user chooses to disable wifi temporarily, we keep wifi disconnected

     * until the p2p connection is done and terminated at which point we will

     * bring back wifi up

     *
@@ -390,7 +390,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
         * not get latest updates about the device without being in discovery state.

         *

         * From the framework perspective, the device is still there since we are connecting or

         * connected to it. so we keep these devices in a seperate list, so that they are removed

         * connected to it. so we keep these devices in a separate list, so that they are removed

         * when connection is cancelled or lost

         */

        private final WifiP2pDeviceList mPeersLostDuringConnection = new WifiP2pDeviceList();