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

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

Browse Source 
* commit '5191b8599011c255936e3a3cacc052c03e57b772':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
This commit is contained in:
Wink Saville
2013-08-08 15:43:07 -07:00
committed by Android Git Automerger
parent 9b6363e5e6 5191b85990
commit b9b4321b75
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/CaptivePortalTracker.java
View File

@@ -42,6 +42,7 @@ import java.io.IOException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.SocketTimeoutException;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -52,7 +53,7 @@ import com.android.internal.R;
* @hide * @hide
*/ */
public class CaptivePortalTracker extends StateMachine { 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 TAG = "CaptivePortalTracker";
private static final String DEFAULT_SERVER = "clients3.google.com"; private static final String DEFAULT_SERVER = "clients3.google.com";
@@ -337,6 +338,9 @@ public class CaptivePortalTracker extends StateMachine {
urlConnection.getInputStream(); urlConnection.getInputStream();
// we got a valid response, but not from the real google // we got a valid response, but not from the real google
return urlConnection.getResponseCode() != 204; return urlConnection.getResponseCode() != 204;
} catch (SocketTimeoutException e) {
if (DBG) log("Probably a portal: exception " + e);
return true;
} catch (IOException e) { } catch (IOException e) {
if (DBG) log("Probably not a portal: exception " + e); if (DBG) log("Probably not a portal: exception " + e);
return false; return false;