summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/net/java/android/net/ip/RouterAdvertisementDaemon.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
index 53c2fd7ce543..407d315f9973 100644
--- a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
+++ b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
@@ -30,7 +30,7 @@ import android.util.Log;
import com.android.internal.annotations.GuardedBy;
-import libcore.io.IoUtils;
+import libcore.io.IoBridge;
import libcore.util.HexEncoding;
import java.io.FileDescriptor;
@@ -457,7 +457,9 @@ public class RouterAdvertisementDaemon {
private void closeSocket() {
if (mSocket != null) {
- IoUtils.closeQuietly(mSocket);
+ try {
+ IoBridge.closeAndSignalBlockedThreads(mSocket);
+ } catch (IOException ignored) {}
}
mSocket = null;
}