Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09d4f4fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 79592503 e33daf12

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

+4 −2
Original line number Diff line number Diff line
@@ -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;

    }