diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-24 11:17:25 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-08-24 11:29:58 -0700 |
| commit | 82f8521d386f3109147c477d04e5e90e5c715fa0 (patch) | |
| tree | 38ba5be71c161c63cc9a8fed9362d05b646f0b4e /packages/VpnDialogs | |
| parent | c268f0b19efd0b6c6c89c21be0893787f3cc9cf7 (diff) | |
| download | frameworks_base-82f8521d386f3109147c477d04e5e90e5c715fa0.zip frameworks_base-82f8521d386f3109147c477d04e5e90e5c715fa0.tar.gz frameworks_base-82f8521d386f3109147c477d04e5e90e5c715fa0.tar.bz2 | |
Migrate legacy VPN arguments to system_server.
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.
Bug: 5756357
Change-Id: I42c1a644f6add477fe4222342640d7db15982cb8
Diffstat (limited to 'packages/VpnDialogs')
| -rw-r--r-- | packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java index ff9bbc5..96de1b9 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java @@ -123,7 +123,11 @@ public class ManageDialog extends AlertActivity implements if (which == DialogInterface.BUTTON_POSITIVE) { mConfig.configureIntent.send(); } else if (which == DialogInterface.BUTTON_NEUTRAL) { - mService.prepareVpn(mConfig.user, VpnConfig.LEGACY_VPN); + if (mConfig.legacy) { + mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN); + } else { + mService.prepareVpn(mConfig.user, VpnConfig.LEGACY_VPN); + } } } catch (Exception e) { Log.e(TAG, "onClick", e); |