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

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

am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 

* commit 'bd3dd73b':
  DO NOT MERGE Avoid nullifying dhcp target
parents 7da1ffc9 bd3dd73b

wifi/java/android/net/wifi/WifiStateTracker.java

+5 −8
Original line number Diff line number Diff line
@@ -934,10 +934,8 @@ public class WifiStateTracker extends NetworkStateTracker { 
                    resetConnections(true);

                }

                // When supplicant dies, kill the DHCP thread

                if (mDhcpTarget != null) {

                mDhcpTarget.getLooper().quit();

                    mDhcpTarget = null;

                }



                mContext.removeStickyBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));

                if (ActivityManagerNative.isSystemReady()) {

                    intent = new Intent(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
@@ -1408,10 +1406,9 @@ public class WifiStateTracker extends NetworkStateTracker { 
        NetworkUtils.resetConnections(mInterfaceName);



        // Stop DHCP

        if (mDhcpTarget != null) {

        mDhcpTarget.setCancelCallback(true);

        mDhcpTarget.removeMessages(EVENT_DHCP_START);

        }



        if (!NetworkUtils.stopDhcp(mInterfaceName)) {

            Log.e(TAG, "Could not stop DHCP");

        }