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

Merge "More correctly close RA daemon socket." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-19 15:20:11 +00:00
committed by Android (Google) Code Review
parent 7959250318 e33daf1295
commit 09d4f4fda4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/net/java/android/net/ip/RouterAdvertisementDaemon.java
View File

@@ -30,7 +30,7 @@ import android.util.Log;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import libcore.io.IoUtils; import libcore.io.IoBridge;
import libcore.util.HexEncoding; import libcore.util.HexEncoding;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -457,7 +457,9 @@ public class RouterAdvertisementDaemon {
private void closeSocket() { private void closeSocket() {
if (mSocket != null) { if (mSocket != null) {
IoUtils.closeQuietly(mSocket); try {
IoBridge.closeAndSignalBlockedThreads(mSocket);
} catch (IOException ignored) {}
} }
mSocket = null; mSocket = null;
} }