Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lorenzo Colitti
2015-08-12 03:38:57 +00:00
committed by Android (Google) Code Review
parent 968fc3ab75 31e19f34f5
commit e022cb085f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/net/java/android/net/dhcp/DhcpClient.java
View File

@@ -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();
} }