Skip to content

platform_frameworks_base: Allow Apple's servers for captive portal check #329

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_frameworks_base: Allow Apple's servers for captive portal check #329

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
1 change: 1 addition & 0 deletions core/api/module-lib-current.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ package android.ext.settings {
public class ConnChecksSetting {
method public static int get();
method public static boolean put(int);
field public static final int VAL_APPLE = 3; // 0x3
field public static final int VAL_DEFAULT = 0; // 0x0
field public static final int VAL_DISABLED = 2; // 0x2
field public static final int VAL_GRAPHENEOS = 0; // 0x0
Expand Down
3 changes: 2 additions & 1 deletion core/java/android/ext/settings/ConnChecksSetting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class ConnChecksSetting {
public static final int VAL_GRAPHENEOS = 0;
public static final int VAL_STANDARD = 1;
public static final int VAL_DISABLED = 2;
public static final int VAL_APPLE = 3;
public static final int VAL_DEFAULT = VAL_GRAPHENEOS;

/**
Expand All @@ -20,7 +21,7 @@ public class ConnChecksSetting {
public static final IntSysProperty SYS_PROP = new IntSysProperty(
"persist.sys.connectivity_checks",
ConnChecksSetting.VAL_DEFAULT,
ConnChecksSetting.VAL_GRAPHENEOS, ConnChecksSetting.VAL_STANDARD, ConnChecksSetting.VAL_DISABLED
ConnChecksSetting.VAL_GRAPHENEOS, ConnChecksSetting.VAL_STANDARD, ConnChecksSetting.VAL_DISABLED, ConnChecksSetting.VAL_APPLE
);

public static int get() {
Expand Down
2 changes: 2 additions & 0 deletions packages/SettingsProvider/src/com/android/providers/settings/SettingsParserState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ private void maybeMigrateConnChecksSetting() {
} else {
if ("https://www.google.com/generate_204".equals(captivePortalHttpsUrl)) {
val = ConnChecksSetting.VAL_STANDARD;
} else if ("https://captive.apple.com".equals(captivePortalHttpsUrl)) {
val = ConnChecksSetting.VAL_APPLE;
} else {
val = ConnChecksSetting.VAL_GRAPHENEOS;
}
Expand Down