From e33daf12957417547efb7896aa81c1289eb80b81 Mon Sep 17 00:00:00 2001
From: Erik Kline <ek@google.com>
Date: Tue, 19 Jul 2016 17:37:27 +0900
Subject: [PATCH] More correctly close RA daemon socket.

Bug: 9580643
Bug: 30190913
Change-Id: I34e34624da09957d96fee38c3f2005e23eb1bee5
---
 .../net/java/android/net/ip/RouterAdvertisementDaemon.java  | 6 ++++--
 1 file 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 53c2fd7ce543b..407d315f99731 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;
     }