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

Commit 662731fb authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev

parents e50853f4 cdebe28c

src/com/android/settings/vpn2/AppDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class AppDialogFragment extends DialogFragment implements AppDialog.Liste 
        final int userId = UserHandle.getUserId(mPackageInfo.applicationInfo.uid);

        try {

            if (mPackageInfo.packageName.equals(getConnectedPackage(mService, userId))) {

                mService.setAlwaysOnVpnPackage(userId, null);

                mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false);

                mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);

            }

        } catch (RemoteException e) {

src/com/android/settings/vpn2/AppManagementFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ public class AppManagementFragment extends SettingsPreferenceFragment 
        if (mUserId == UserHandle.USER_SYSTEM) {

            VpnUtils.clearLockdownVpn(getContext());

        }

        mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, isEnabled ? mPackageName : null);

        mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, isEnabled ? mPackageName : null,

                /* lockdownEnabled */ false);

        if (isEnabled && !isVpnAlwaysOn()) {

            CannotConnectFragment.show(this, mVpnLabel);

        }

src/com/android/settings/vpn2/ConfigDialogFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ public class ConfigDialogFragment extends DialogFragment implements 
            }



            final ConnectivityManager conn = ConnectivityManager.from(getActivity());

            conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null);

            conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,

                    /* lockdownEnabled */ false);

            VpnUtils.setLockdownVpn(getContext(), profile.key);

        } else {

            // update only if lockdown vpn has been changed