Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3416020 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Avoid legacy VPN bringing down system server."

parents b3933b97 421fab8a

services/java/com/android/server/net/LockdownVpnTracker.java

+7 −2
Original line number Diff line number Diff line
@@ -148,8 +148,13 @@ public class LockdownVpnTracker { 
                showNotification(R.string.vpn_lockdown_connecting, R.drawable.vpn_disconnected);



                mAcceptedEgressIface = egressProp.getInterfaceName();

                try {

                    mVpn.startLegacyVpn(mProfile, KeyStore.getInstance(), egressProp);



                } catch (IllegalStateException e) {

                    mAcceptedEgressIface = null;

                    Slog.e(TAG, "Failed to start VPN", e);

                    showNotification(R.string.vpn_lockdown_error, R.drawable.vpn_disconnected);

                }

            } else {

                Slog.e(TAG, "Invalid VPN profile; requires IP-based server and DNS");

                showNotification(R.string.vpn_lockdown_error, R.drawable.vpn_disconnected);