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

Commit 5d381ac6 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Revert "Update to use new ConnectivityManager API."" am: 9c7ddce3 am: 2105dc52 

am: 11247ebb

Change-Id: Id9a817cb440ce1ae538b7f6fd3f5c81a95efb346
parents 24ec60a9 11247ebb

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

+1 −2
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App 
        final int userId = getUserId();

        try {

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

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

                        /* lockdownWhitelist */ 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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment 


    private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) {

        return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,

                isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null);

                isEnabled ? mPackageName : null, isLockdown);

    }



    private void updateUI() {

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

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements 


            final ConnectivityManager conn = ConnectivityManager.from(mContext);

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

                    /* lockdownEnabled */ false, /* lockdownWhitelist */ null);

                    /* lockdownEnabled */ false);

            VpnUtils.setLockdownVpn(mContext, profile.key);

        } else {

            // update only if lockdown vpn has been changed