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

* commit 'c7f2030ffc64bf60db020c4847fadef4c9c58ab5':
  Don't attempt to stop the receive thread if we never started it.

1 files changed, 4 insertions, 1 deletions

diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index 2d4029117677..9ee9cf4fbcc6 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -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();
         }