Skip to content

don't auto-remove always-on VPN when its service becomes unresolvable #387

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

Merged
thestinger merged 1 commit into from
Jun 23, 2026
Merged

don't auto-remove always-on VPN when its service becomes unresolvable #387

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
7 changes: 1 addition & 6 deletions services/core/java/com/android/server/connectivity/Vpn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,13 +1153,8 @@ public boolean startAlwaysOnVpn() {
if (alwaysOnPackage == null) {
return true;
}
// Remove always-on VPN if it's not supported.
if (!isAlwaysOnPackageSupported(alwaysOnPackage)) {
// Do not remove the always-on setting due to the restricted ability in safe mode.
// The always-on VPN can then start after the device reboots to normal mode.
if (!mContext.getPackageManager().isSafeMode()) {
setAlwaysOnPackage(null, false, null);
}
Log.i(TAG, "startAlwaysOnVpn: isAlwaysOnPackageSupported returned false for " + alwaysOnPackage, new Throwable());
return false;
}
// Skip if the service is already established. This isn't bulletproof: it's not bound
Expand Down