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

VpnSettings: make more fields available as advanced options.

Browse Source 
Now users can manually override DNS search domains, DNS servers,
and forwarding routes for each VPN network.

Change-Id: I10b8e383ac19fd19d23938dff78201a71724d58f
This commit is contained in:
Chia-chi Yeh
2011-07-27 15:49:43 -07:00
parent b7cdf167bb
commit d68dbe29bb
5 changed files with 90 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);