summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/vpn2
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-11-02 14:57:54 -0700
committerChia-chi Yeh <chiachi@android.com>2011-11-02 14:59:33 -0700
commit94c6cd6c29cb7cc92b4f5377db78df02c769f7c1 (patch)
tree09fc22fb7eeed7f9bf13dea6bc5b5cbf3588786b /src/com/android/settings/vpn2
parent442c45ad0984f241f852f253b46180aaaef6642b (diff)
downloadpackages_apps_Settings-94c6cd6c29cb7cc92b4f5377db78df02c769f7c1.zip
packages_apps_Settings-94c6cd6c29cb7cc92b4f5377db78df02c769f7c1.tar.gz
packages_apps_Settings-94c6cd6c29cb7cc92b4f5377db78df02c769f7c1.tar.bz2
VpnSettings: do not copy unsaved fields.
Bug: 5554228 Change-Id: I1f1d6d89f99c728e48e2abe00920a1f36bd53576
Diffstat (limited to 'src/com/android/settings/vpn2')
-rw-r--r--src/com/android/settings/vpn2/VpnDialog.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index cce5e2d..604c8ba 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -100,8 +100,10 @@ class VpnDialog extends AlertDialog implements TextWatcher,
mName.setText(mProfile.name);
mType.setSelection(mProfile.type);
mServer.setText(mProfile.server);
- mUsername.setText(mProfile.username);
- mPassword.setText(mProfile.password);
+ if (mProfile.saveLogin) {
+ mUsername.setText(mProfile.username);
+ mPassword.setText(mProfile.password);
+ }
mSearchDomains.setText(mProfile.searchDomains);
mDnsServers.setText(mProfile.dnsServers);
mRoutes.setText(mProfile.routes);