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

Merge "Add debug and remove SocketTimeoutException." into klp-dev

Browse Source
This commit is contained in:
Wink Saville
2013-08-30 03:30:51 +00:00
committed by Android (Google) Code Review
parent 0d72b3e052 9d4204d625
commit e8fcfd53f6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,17 +397,14 @@ public class CaptivePortalTracker extends StateMachine {
long responseTimestamp = SystemClock.elapsedRealtime(); long responseTimestamp = SystemClock.elapsedRealtime();
// we got a valid response, but not from the real google // we got a valid response, but not from the real google
boolean isCaptivePortal = urlConnection.getResponseCode() != 204; int rspCode = urlConnection.getResponseCode();
boolean isCaptivePortal = rspCode != 204;
sendNetworkConditionsBroadcast(true /* response received */, isCaptivePortal, sendNetworkConditionsBroadcast(true /* response received */, isCaptivePortal,
requestTimestamp, responseTimestamp); requestTimestamp, responseTimestamp);
if (DBG) log("isCaptivePortal: ret=" + isCaptivePortal + " rspCode=" + rspCode);
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) {