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

Commit 02160e54 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge \\"More correctly close RA daemon socket.\\" into nyc-mr1-dev am: 09d4f4fd 

am: ec2748e3

Change-Id: I83a33ae546003fb3fe76f7ad9fe251f188ed00ba
parents d6547869 ec2748e3

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;

    }