am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is...

am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev

* commit 'b9b4321b':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

core/java/android/net/CaptivePortalTracker.java

@@ -42,6 +42,7 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.net.Inet4Address;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.UnknownHostException;
 
@@ -52,7 +53,7 @@ import com.android.internal.R;
  * @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";
@@ -337,6 +338,9 @@ public class CaptivePortalTracker extends StateMachine {
             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;