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

Commit 525b0dbc authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

Merge "Update to use new ConnectivityManager API." 

am: 161f5ec3

Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76
parents 0d8ea3bf 161f5ec3

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

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,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
@@ -224,7 +224,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
@@ -200,7 +200,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