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

Commit 6ceed53e authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android Git Automerger
Browse files

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

* commit 'e022cb08':
  Don't attempt to stop the receive thread if we never started it.
parents 47c5338b e022cb08

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

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

        @Override

        public void exit() {

        public void exit() {

            cancelOneshotTimeout();

            cancelOneshotTimeout();

            if (mReceiveThread != null) {

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

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

                mReceiveThread = null;

            }

            clearDhcpState();

            clearDhcpState();

        }

        }