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

Commit a2f6de4b authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Update to use new ConnectivityManager API."

parents 62fce79a ab871a00

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

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ 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);

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

                        /* lockdownWhitelist */ null);

                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);

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

    }



    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);

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

            VpnUtils.setLockdownVpn(mContext, profile.key);

        } else {

            // update only if lockdown vpn has been changed