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

Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev

Browse Source
This commit is contained in:
Wink Saville
2013-08-09 00:09:23 +00:00
committed by Android (Google) Code Review
parent 0933570357 f35f3201db
commit f5f75cd8f2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,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;
import java.util.List; import java.util.List;
@@ -65,7 +66,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";
@@ -382,6 +383,12 @@ public class CaptivePortalTracker extends StateMachine {
sendNetworkConditionsBroadcast(true /* response received */, isCaptivePortal, sendNetworkConditionsBroadcast(true /* response received */, isCaptivePortal,
requestTimestamp, responseTimestamp); requestTimestamp, responseTimestamp);
return isCaptivePortal; return isCaptivePortal;
} catch (SocketTimeoutException e) {
if (DBG) log("Probably a portal: exception " + e);
if (requestTimestamp != -1) {
sendFailedCaptivePortalCheckBroadcast(requestTimestamp);
} // else something went wrong with setting up the urlConnection
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);
if (requestTimestamp != -1) { if (requestTimestamp != -1) {