diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 20:47:46 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 20:47:46 -0400 |
| commit | c0e34db16864e25946b288cb165ad833b62d3b18 (patch) | |
| tree | 3fa435246ac00c2159d194939ccccd7f5b39e2ca /src/com/android | |
| parent | 98d76cc9b882466a97fb55913f5a507a642b5018 (diff) | |
| parent | fad4a4c07ac11785999ab09682416d10a561c692 (diff) | |
| download | packages_apps_settings-c0e34db16864e25946b288cb165ad833b62d3b18.zip packages_apps_settings-c0e34db16864e25946b288cb165ad833b62d3b18.tar.gz packages_apps_settings-c0e34db16864e25946b288cb165ad833b62d3b18.tar.bz2 | |
Merge change Ifad4a4c0 into eclair
* changes:
Add L2tpIpsec case in VpnSettings.processSecrets()
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/vpn/VpnSettings.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java index d0c6a89..d380375 100644 --- a/src/com/android/settings/vpn/VpnSettings.java +++ b/src/com/android/settings/vpn/VpnSettings.java @@ -948,6 +948,7 @@ public class VpnSettings extends PreferenceActivity implements pskProfile.setPresharedKey(key); // pass through + case L2TP_IPSEC: case L2TP: L2tpProfile l2tpProfile = (L2tpProfile) p; key = KEY_PREFIX_L2TP_SECRET + p.getId(); |