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

2015-08-12 03:38:57 +00:00
parent 968fc3ab75 31e19f34f5
commit e022cb085f
1 changed files with 4 additions and 1 deletions
--- 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();
        }