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

Commit 395f0de0 authored by sj.cha's avatar sj.cha Committed by android-build-merger
Browse files

Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am:... 

Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570f am: 3b92631a
am: 10957727

Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a
parents 53c71a90 10957727

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

+6 −1
Original line number Diff line number Diff line
@@ -3661,7 +3661,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // Tear down existing lockdown if profile was removed

        mLockdownEnabled = LockdownVpnTracker.isEnabled();

        if (mLockdownEnabled) {

            final String profileName = new String(mKeyStore.get(Credentials.LOCKDOWN_VPN));

            byte[] profileTag = mKeyStore.get(Credentials.LOCKDOWN_VPN);

            if (profileTag == null) {

                Slog.e(TAG, "Lockdown VPN configured but cannot be read from keystore");

                return false;

            }

            String profileName = new String(profileTag);

            final VpnProfile profile = VpnProfile.decode(

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

            if (profile == null) {