commit 7d646ae44b751fe65f0be6a359282bd0f28c5223
author John Reck <jreck@google.com> Tue Feb 01 18:35:58 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 01 18:35:58 2011 -0800
tree 85a5007912834dc436349df1845088b2ec1779a5
parent f31f47c577564de7adbd649f51555b1fd681220b
parent 9f405cf4ab8c86a008555c7ccafb7e95a2c6bf52

am 9f405cf4: am 4f30c10d: Fix automatic sign-in not remembering disabled

* commit '9f405cf4ab8c86a008555c7ccafb7e95a2c6bf52':
  Fix automatic sign-in not remembering disabled

src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
index 91705e5..409ddb7 100644
--- a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
@@ -71,8 +71,12 @@
         values[i] = "";
         autologinPref.setEntries(names);
         autologinPref.setEntryValues(values);
-        autologinPref.setValue(BrowserSettings.getInstance()
-                .getAutoLoginAccount(getActivity()));
+        BrowserSettings bs = BrowserSettings.getInstance();
+        if (bs.isAutoLoginEnabled()) {
+            autologinPref.setValue(bs.getAutoLoginAccount(getActivity()));
+        } else {
+            autologinPref.setValue("");
+        }
     }
 
     private void updateAutoLoginSummary(Preference pref) {