am ae852672: Merge "VpnSettings: do not copy unsaved fields."

* commit 'ae852672a04d2c501e515177791d7e7a0492d1e0':
  VpnSettings: do not copy unsaved fields.
This commit is contained in:
Chia-chi Yeh
2011-11-02 22:07:19 +00:00
committed by Android Git Automerger

View File

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