Merge "Fix RouterAdvertisementDaemon thread leakage problem"

2019-02-22 07:39:20 +00:00
parent 233b4f140b 6dea37dc6e
commit 1d8977b992
1 changed files with 3 additions and 0 deletions
--- a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
+++ b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
@@ -275,6 +275,9 @@ public class RouterAdvertisementDaemon {

    public void stop() {
        closeSocket();
+        // Wake up mMulticastTransmitter thread to interrupt a potential 1 day sleep before
+        // the thread's termination.
+        maybeNotifyMulticastTransmitter();
        mMulticastTransmitter = null;
        mUnicastResponder = null;
    }