Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a problem with leaking UDP sockets." into kraken

Browse Source
This commit is contained in:
Nick Kralevich
2010-06-09 14:49:10 -07:00
committed by Android (Google) Code Review
parent ae706c10c0 929b4855b8
commit 2feafeffb8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/WifiWatchdogService.java
View File

@@ -1217,8 +1217,9 @@ public class WifiWatchdogService {
private static Random sRandom = new Random(); private static Random sRandom = new Random();
static boolean isDnsReachable(int dns, int timeout) { static boolean isDnsReachable(int dns, int timeout) {
DatagramSocket socket = null;
try { try {
DatagramSocket socket = new DatagramSocket(); socket = new DatagramSocket();
// Set some socket properties // Set some socket properties
socket.setSoTimeout(timeout); socket.setSoTimeout(timeout);
@@ -1271,6 +1272,10 @@ public class WifiWatchdogService {
Slog.d(TAG, "DnsPinger.isReachable got an unknown exception", e); Slog.d(TAG, "DnsPinger.isReachable got an unknown exception", e);
} }
return false; return false;
} finally {
if (socket != null) {
socket.close();
}
} }
} }