diff options
| author | Nick Kralevich <nnk@google.com> | 2010-06-09 14:49:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-09 14:49:10 -0700 |
| commit | 2feafeffb8c2a5e02cb7998194d129ab0f43f9b0 (patch) | |
| tree | 0532163e1551e707127a800269db4dfcdc111d2f | |
| parent | ae706c10c08209cdca79725ac7d25eec50777ada (diff) | |
| parent | 929b4855b8208d36272769e8eeaa6cd2823b94c0 (diff) | |
| download | frameworks_base-2feafeffb8c2a5e02cb7998194d129ab0f43f9b0.zip frameworks_base-2feafeffb8c2a5e02cb7998194d129ab0f43f9b0.tar.gz frameworks_base-2feafeffb8c2a5e02cb7998194d129ab0f43f9b0.tar.bz2 | |
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(); + } } } |