SystemUI: VpnTile: Don't ask for user/pw on IKEv2/IPSec PSK and RSA (24963869) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/net/VpnProfile.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,21 @@ public final class VpnProfile implements Cloneable, Parcelable {
		}
		}

		/**
		* Returns {@code true} if the VPN type requires username and password.
		*
		* <p>In sync with Settings's ConfigDialog.
		*/
		public boolean isUsernamePasswordRequiredVpnProfile() {
		switch (type) {
		case VpnProfile.TYPE_IKEV2_IPSEC_RSA: // fall through
		case VpnProfile.TYPE_IKEV2_IPSEC_PSK:
		return false;
		default:
		return true;
		}
		}

		private boolean isValidLockdownLegacyVpnProfile() {
		return isLegacyType(type) && isServerAddressNumeric() && hasDns()
		&& areDnsAddressesNumeric();

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ public class VpnTile extends QSTileImpl<BooleanState> {
		}

		private void connectVpnOrAskForCredentials(VpnProfile profile) {
		if (profile.saveLogin) {
		if (!profile.isUsernamePasswordRequiredVpnProfile() \|\| profile.saveLogin) {
		mController.connectLegacyVpn(profile);
		return;
		}