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.
2015-08-12 03:53:40 +00:00
parent cbb24e24a3 c7f2030ffc
commit f9ddfd23ac
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();
        }