From 94c6cd6c29cb7cc92b4f5377db78df02c769f7c1 Mon Sep 17 00:00:00 2001
From: Chia-chi Yeh <chiachi@android.com>
Date: Wed, 2 Nov 2011 14:57:54 -0700
Subject: [PATCH] VpnSettings: do not copy unsaved fields.

Bug: 5554228
Change-Id: I1f1d6d89f99c728e48e2abe00920a1f36bd53576
---
 src/com/android/settings/vpn2/VpnDialog.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index cce5e2d637c..604c8bae6fc 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);