Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev

import java.net.HttpURLConnection;

import java.net.InetAddress;

import java.net.Inet4Address;

import java.net.SocketTimeoutException;

import java.net.URL;

import java.net.UnknownHostException;

 * @hide

 */

public class CaptivePortalTracker extends StateMachine {

    private static final boolean DBG = false;

    private static final boolean DBG = true;

    private static final String TAG = "CaptivePortalTracker";

    private static final String DEFAULT_SERVER = "clients3.google.com";

            urlConnection.getInputStream();

            // we got a valid response, but not from the real google

            return urlConnection.getResponseCode() != 204;

        } catch (SocketTimeoutException e) {

            if (DBG) log("Probably a portal: exception " + e);

            return true;

        } catch (IOException e) {

            if (DBG) log("Probably not a portal: exception " + e);

            return false;