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

Commit 9a9f6f31 authored Dec 05, 2018 by Pavel Grafov

Update to use new ConnectivityManager API.

Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1

parent 15bf05f6

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