Merge change Ifad4a4c0 into eclair

* changes:
  Add L2tpIpsec case in VpnSettings.processSecrets()
This commit is contained in:
Android (Google) Code Review
2009-10-06 20:47:46 -04:00

View File

@@ -948,6 +948,7 @@ public class VpnSettings extends PreferenceActivity implements
pskProfile.setPresharedKey(key); pskProfile.setPresharedKey(key);
// pass through // pass through
case L2TP_IPSEC:
case L2TP: case L2TP:
L2tpProfile l2tpProfile = (L2tpProfile) p; L2tpProfile l2tpProfile = (L2tpProfile) p;
key = KEY_PREFIX_L2TP_SECRET + p.getId(); key = KEY_PREFIX_L2TP_SECRET + p.getId();