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

Commit 12ff46df authored by Erik Kline's avatar Erik Kline Committed by Android Git Automerger
Browse files

am 51eb6e14: am 9c8abd1d: am f23eece2: am b7e722b8: Merge "Don\'t crash if an... 

am 51eb6e14: am 9c8abd1d: am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev

* commit '51eb6e14':
  Don't crash if an invalid always-on VPN profile is configured.
parents e95ce0fd 51eb6e14

services/core/java/com/android/server/ConnectivityService.java

+5 −0
Original line number Diff line number Diff line
@@ -3215,6 +3215,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            final String profileName = new String(mKeyStore.get(Credentials.LOCKDOWN_VPN));

            final VpnProfile profile = VpnProfile.decode(

                    profileName, mKeyStore.get(Credentials.VPN + profileName));

            if (profile == null) {

                Slog.e(TAG, "Lockdown VPN configured invalid profile " + profileName);

                setLockdownTracker(null);

                return true;

            }

            int user = UserHandle.getUserId(Binder.getCallingUid());

            synchronized(mVpns) {

                setLockdownTracker(new LockdownVpnTracker(mContext, mNetd, this, mVpns.get(user),