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

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

Browse Source 
* commit 'e8fcfd53f60229f7f920992145bacb45a0a55675':
  Add debug and remove SocketTimeoutException.
This commit is contained in:
Wink Saville
2013-08-29 20:33:49 -07:00
committed by Android Git Automerger
parent 53be76e172 e8fcfd53f6
commit 1681172544
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();
// 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,
requestTimestamp, responseTimestamp);
if (DBG) log("isCaptivePortal: ret=" + isCaptivePortal + " rspCode=" + rspCode);
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) {