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

Commit 91a0c098 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Disable always-on VPN in factoryReset" am: 63c14e0a am: 1135d509 am: e2554d51 

am: 08d05b27

Change-Id: Iaccb7394994ccce66df0ab2f713fd890a8b999c8
parents 26ba16e4 08d05b27

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

+12 −0
Original line number Diff line number Diff line
@@ -5512,6 +5512,18 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                }

            }



            // Turn Always-on VPN off

            if (mLockdownEnabled && userId == UserHandle.USER_SYSTEM) {

                final long ident = Binder.clearCallingIdentity();

                try {

                    mKeyStore.delete(Credentials.LOCKDOWN_VPN);

                    mLockdownEnabled = false;

                    setLockdownTracker(null);

                } finally {

                    Binder.restoreCallingIdentity(ident);

                }

            }



            // Turn VPN off

            VpnConfig vpnConfig = getVpnConfig(userId);

            if (vpnConfig != null) {