Skip to content

platform_packages_modules_NetworkStack: Allow Apple's servers for captive portal check #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neelchauhan wants to merge 1 commit into
base: 16-qpr2
Choose a base branch
from
Open

platform_packages_modules_NetworkStack: Allow Apple's servers for captive portal check #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions res/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
this resource. It will break if the enforcement of overlayable starts.
-->
<string name="default_captive_portal_http_url_grapheneos" translatable="false">http://connectivitycheck.grapheneos.network/generate_204</string>
<string name="default_captive_portal_http_url_apple" translatable="false">http://captive.apple.com</string>
<string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.com/generate_204</string>
<!-- HTTPS URL for network validation, to use for confirming internet connectivity. -->
<!-- default_captive_portal_https_url is not configured as overlayable so
Expand All @@ -23,6 +24,7 @@
this resource. It will break if the enforcement of overlayable starts.
-->
<string name="default_captive_portal_https_url_grapheneos" translatable="false">https://connectivitycheck.grapheneos.network/generate_204</string>
<string name="default_captive_portal_https_url_apple" translatable="false">https://captive.apple.com</string>
<string name="default_captive_portal_https_url" translatable="false">https://www.google.com/generate_204</string>

<!-- List of fallback URLs to use for detecting captive portals. -->
Expand Down
6 changes: 6 additions & 0 deletions src/com/android/server/connectivity/NetworkMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2686,6 +2686,9 @@ private URL[] makeCaptivePortalHttpsUrls(@NonNull Context context) {
case ConnChecksSetting.VAL_GRAPHENEOS:
resId = R.string.default_captive_portal_https_url_grapheneos;
break;
case ConnChecksSetting.VAL_APPLE:
resId = R.string.default_captive_portal_https_url_apple;
break;
case ConnChecksSetting.VAL_STANDARD:
resId = R.string.default_captive_portal_https_url;
break;
Expand All @@ -2701,6 +2704,9 @@ private URL[] makeCaptivePortalHttpUrls(@NonNull Context context) {
case ConnChecksSetting.VAL_GRAPHENEOS:
resId = R.string.default_captive_portal_http_url_grapheneos;
break;
case ConnChecksSetting.VAL_APPLE:
resId = R.string.default_captive_portal_http_url_apple;
break;
case ConnChecksSetting.VAL_STANDARD:
resId = R.string.default_captive_portal_http_url;
break;
Expand Down