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

* commit 'e022cb085f6ebc2801f843bb47c9fd23f6daa3ea':
  Don't attempt to stop the receive thread if we never started it.
This commit is contained in:
Lorenzo Colitti
2015-08-12 03:45:30 +00:00
committed by Android Git Automerger

View File

@@ -603,7 +603,10 @@ public class DhcpClient extends BaseDhcpStateMachine {
@Override
public void exit() {
cancelOneshotTimeout();
mReceiveThread.halt(); // Also closes sockets.
if (mReceiveThread != null) {
mReceiveThread.halt(); // Also closes sockets.
mReceiveThread = null;
}
clearDhcpState();
}