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

Merge commit '81132d51' into fix-merge-conflict

Browse Source 
* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5
This commit is contained in:
Wink Saville
2013-08-08 16:51:46 -07:00
parent 280f6218a5 81132d5197
commit f35f3201db
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.InetAddress;
import java.net.Inet4Address;
import java.net.SocketTimeoutException;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.List;
@@ -65,7 +66,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";
@@ -382,6 +383,12 @@ public class CaptivePortalTracker extends StateMachine {
sendNetworkConditionsBroadcast(true /* response received */, isCaptivePortal,
requestTimestamp, responseTimestamp);
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) {
if (DBG) log("Probably not a portal: exception " + e);
if (requestTimestamp != -1) {