Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 321e8158 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am a2c6d5bf: do not merge: cherry-picked... 

am a2c6d5bf: do not merge: cherry-picked 929b4855 from master branch

Merge commit 'a2c6d5bf' into froyo-plus-aosp

* commit 'a2c6d5bf':
  do not merge: cherry-picked 929b4855 from master branch
parents 4817cfc7 a2c6d5bf

services/java/com/android/server/WifiWatchdogService.java

+6 −1
Original line number Diff line number Diff line
@@ -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();

                }

            }

        }