diff options
Diffstat (limited to 'src/com/android/settings/vpn2/VpnSettings.java')
| -rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 4dbb6bd..2ab99e8 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -108,7 +108,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements Credentials.getInstance().unlock(getActivity()); } else { // We already tried, but it is still not working! - getActivity().getFragmentManager().popBackStack(); + finishFragment(); } mUnlocking = !mUnlocking; return; @@ -429,8 +429,11 @@ public class VpnSettings extends SettingsPreferenceFragment implements config.interfaze = interfaze; config.session = profile.name; config.routes = profile.routes; + if (!profile.dnsServers.isEmpty()) { + config.dnsServers = Arrays.asList(profile.dnsServers.split(" +")); + } if (!profile.searchDomains.isEmpty()) { - config.searchDomains = Arrays.asList(profile.searchDomains.split(" ")); + config.searchDomains = Arrays.asList(profile.searchDomains.split(" +")); } mService.startLegacyVpn(config, racoon, mtpd); |