am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken

1 files changed, 6 insertions, 1 deletions

diff --git a/services/java/com/android/server/WifiWatchdogService.java b/services/java/com/android/server/WifiWatchdogService.java
index 87f8a6e69c3f..445dd0366d57 100644
--- a/services/java/com/android/server/WifiWatchdogService.java
+++ b/services/java/com/android/server/WifiWatchdogService.java
@@ -1217,8 +1217,9 @@ public class WifiWatchdogService {
         private static Random sRandom = new Random();
         
         static boolean isDnsReachable(int dns, int timeout) {
+            DatagramSocket socket = null;
             try {
-                DatagramSocket socket = new DatagramSocket();
+                socket = new DatagramSocket();
                 
                 // Set some socket properties
                 socket.setSoTimeout(timeout);
@@ -1271,6 +1272,10 @@ public class WifiWatchdogService {
                     Slog.d(TAG, "DnsPinger.isReachable got an unknown exception", e);
                 }
                 return false;
+            } finally {
+                if (socket != null) {
+                    socket.close();
+                }
             }
         }