commit 16b4e4a11c89f98700f34990c1f3849f12e557bb
author John Reck <jreck@google.com> Tue Feb 01 19:32:38 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 01 19:32:38 2011 -0800
tree 9b54b707a639dbc461ca6d6f1bbe315f99cfe49c
parent 4f30c10de7f55e435fcc9bc1762ee45421a8fe65
parent 73eb105e5bb53356e171837bd6b13b29661806e3

Merge "Slow widget memory leak." into honeycomb

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) {