bug 1452616 - make TRR not wait for captive portal on Android by default r?mcmanus draft
authorDaniel Stenberg <daniel@haxx.se>
Fri, 13 Apr 2018 00:56:58 +0200
changeset 781437 0fe7fd5b9c2507f37237993adabe8a449c0730e1
parent 781409 325ef357e5b73d63794e47c02c7f8e7cf58ccb48
push id106301
push userbmo:daniel@haxx.se
push dateThu, 12 Apr 2018 22:57:55 +0000
reviewersmcmanus
bugs1452616
milestone61.0a1
bug 1452616 - make TRR not wait for captive portal on Android by default r?mcmanus MozReview-Commit-ID: DR3PgYuzZWs
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5292,17 +5292,22 @@ pref("network.captive-portal-service.ena
 // DNS Trusted Recursive Resolver
 // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
 pref("network.trr.mode", 0);
 // DNS-over-HTTP service to use, must be HTTPS://
 pref("network.trr.uri", "");
 // credentials to pass to DOH end-point
 pref("network.trr.credentials", "");
 // Wait for captive portal confirmation before enabling TRR
+#if defined(ANDROID)
+// On Android, the captive portal is handled by the OS itself
+pref("network.trr.wait-for-portal", false);
+#else
 pref("network.trr.wait-for-portal", true);
+#endif
 // Allow RFC1918 address in responses?
 pref("network.trr.allow-rfc1918", false);
 // Use GET (rather than POST)
 pref("network.trr.useGET", false);
 // Before TRR is widely used the NS record for this host is fetched
 // from the DOH end point to ensure proper configuration
 pref("network.trr.confirmationNS", "example.com");
 // hardcode the resolution of the hostname in network.trr.uri instead of