PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Omit PPTP VPNs from lockdown list.

Browse Source 
Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
This commit is contained in:
Jeff Sharkey
2012-09-18 15:35:35 -07:00
parent b92e9afe4d
commit f5de1db28a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -49,6 +49,7 @@ import android.widget.Toast;
import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
@@ -463,7 +464,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
private void initProfiles(KeyStore keyStore, Resources res) { private void initProfiles(KeyStore keyStore, Resources res) {
final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN); final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN);
mProfiles = loadVpnProfiles(keyStore); mProfiles = loadVpnProfiles(keyStore, VpnProfile.TYPE_PPTP);
mTitles = Lists.newArrayList(); mTitles = Lists.newArrayList();
mTitles.add(res.getText(R.string.vpn_lockdown_none)); mTitles.add(res.getText(R.string.vpn_lockdown_none));
mCurrentIndex = 0; mCurrentIndex = 0;
@@ -523,14 +524,14 @@ public class VpnSettings extends SettingsPreferenceFragment implements
} }
} }
private static List<VpnProfile> loadVpnProfiles(KeyStore keyStore) { private static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
final ArrayList<VpnProfile> result = Lists.newArrayList(); final ArrayList<VpnProfile> result = Lists.newArrayList();
final String[] keys = keyStore.saw(Credentials.VPN); final String[] keys = keyStore.saw(Credentials.VPN);
if (keys != null) { if (keys != null) {
for (String key : keys) { for (String key : keys) {
final VpnProfile profile = VpnProfile.decode( final VpnProfile profile = VpnProfile.decode(
key, keyStore.get(Credentials.VPN + key)); key, keyStore.get(Credentials.VPN + key));
if (profile != null) { if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
result.add(profile); result.add(profile);
} }
} }