From a2c6d5bf308181c019ade0aac6d25fe33dc3d76c Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 9 Jun 2010 14:27:43 -0700 Subject: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa --- services/java/com/android/server/WifiWatchdogService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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(); + } } } -- cgit v1.2.3-59-g8ed1b