From f5de1db28a61d159e62ef42f64a2cdcb316d0c2c Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 18 Sep 2012 15:35:35 -0700 Subject: Omit PPTP VPNs from lockdown list. Bug: 7064069 Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9 --- src/com/android/settings/vpn2/VpnSettings.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 07aa04f..931f0c2 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -49,6 +49,7 @@ import android.widget.Toast; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; +import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.google.android.collect.Lists; @@ -463,7 +464,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements private void initProfiles(KeyStore keyStore, Resources res) { final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN); - mProfiles = loadVpnProfiles(keyStore); + mProfiles = loadVpnProfiles(keyStore, VpnProfile.TYPE_PPTP); mTitles = Lists.newArrayList(); mTitles.add(res.getText(R.string.vpn_lockdown_none)); mCurrentIndex = 0; @@ -523,14 +524,14 @@ public class VpnSettings extends SettingsPreferenceFragment implements } } - private static List loadVpnProfiles(KeyStore keyStore) { + private static List loadVpnProfiles(KeyStore keyStore, int... excludeTypes) { final ArrayList result = Lists.newArrayList(); final String[] keys = keyStore.saw(Credentials.VPN); if (keys != null) { for (String key : keys) { final VpnProfile profile = VpnProfile.decode( key, keyStore.get(Credentials.VPN + key)); - if (profile != null) { + if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) { result.add(profile); } } -- cgit v1.1