commit e33daf12957417547efb7896aa81c1289eb80b81
author Erik Kline <ek@google.com> Tue Jul 19 17:37:27 2016 +0900
committer Erik Kline <ek@google.com> Tue Jul 19 22:44:21 2016 +0900
tree 5448c442a662b2d1a3334132a385fe29284ee7fb
parent 8cb020227ddb70d255350ef3867842b2fe00ea6f

More correctly close RA daemon socket.

Bug: 9580643
Bug: 30190913
Change-Id: I34e34624da09957d96fee38c3f2005e23eb1bee5

services/net/java/android/net/ip/RouterAdvertisementDaemon.java

diff --git a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
index 53c2fd7..407d315 100644
--- a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
+++ b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
@@ -30,7 +30,7 @@
 
 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 @@
 
     private void closeSocket() {
         if (mSocket != null) {
-            IoUtils.closeQuietly(mSocket);
+            try {
+                IoBridge.closeAndSignalBlockedThreads(mSocket);
+            } catch (IOException ignored) {}
         }
         mSocket = null;
     }