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

Merge "Captive portals: reinspect http result after fallback probe"

Browse Source 
am: 3a7c4f3337

Change-Id: Ia9dfbb764909aeb8586066121ddc8106fa14bb7e
This commit is contained in:
Hugo Benichi
2017-05-18 02:58:21 +00:00
committed by android-build-merger
parent 9fdc903af7 3a7c4f3337
commit 3bda223110
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -967,14 +967,18 @@ public class NetworkMonitor extends StateMachine {
return result; return result;
} }
} }
// Otherwise wait until https probe completes and use its result. // Otherwise wait until http and https probes completes and use their results.
try { try {
httpProbe.join();
if (httpProbe.result().isPortal()) {
return httpProbe.result();
}
httpsProbe.join(); httpsProbe.join();
return httpsProbe.result();
} catch (InterruptedException e) { } catch (InterruptedException e) {
validationLog("Error: https probe wait interrupted!"); validationLog("Error: http or https probe wait interrupted!");
return CaptivePortalProbeResult.FAILED; return CaptivePortalProbeResult.FAILED;
} }
return httpsProbe.result();
} }
private URL makeURL(String url) { private URL makeURL(String url) {