diff options
| author | Nick Kralevich <nnk@google.com> | 2010-06-09 15:26:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-09 15:26:41 -0700 |
| commit | dfda2adc3dc32ca5d4a74c1caaa571bf77116c42 (patch) | |
| tree | 52f6c87737394087229aedc40a72c0c0e715c25e | |
| parent | 8a5f10b30dae663eb01372490df3497e8a2ad56a (diff) | |
| parent | 69b04a707513dcb166ed79277e0ae7129d09d4c4 (diff) | |
| download | frameworks_base-dfda2adc3dc32ca5d4a74c1caaa571bf77116c42.zip frameworks_base-dfda2adc3dc32ca5d4a74c1caaa571bf77116c42.tar.gz frameworks_base-dfda2adc3dc32ca5d4a74c1caaa571bf77116c42.tar.bz2 | |
am 69b04a70: am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
| -rw-r--r-- | services/java/com/android/server/WifiWatchdogService.java | 7 |
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 87f8a6e..445dd03 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(); + } } } |