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

Commit 21219a7a authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android Git Automerger
Browse files

am 64fcffd9: am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to... 

am 64fcffd9: am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev

* commit '64fcffd9':
  Don't attempt to stop the receive thread if we never started it.
parents 6d675bc8 64fcffd9

services/net/java/android/net/dhcp/DhcpClient.java

+4 −1
Original line number Diff line number Diff line
@@ -603,7 +603,10 @@ public class DhcpClient extends BaseDhcpStateMachine { 
        @Override

        public void exit() {

            cancelOneshotTimeout();

            if (mReceiveThread != null) {

                mReceiveThread.halt();  // Also closes sockets.

                mReceiveThread = null;

            }

            clearDhcpState();

        }