From bd3151980baf8a7d3a13f735f4a7f2001d397e72 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 29 Jul 2011 10:05:47 -0700
Subject: Fix resetting defaults triggering prelogin

 Bug: 4163516

Change-Id: I0a64ab19469c25f8c267699fd6bce4fb599f78f9
---
 src/com/android/browser/BrowserSettings.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/com/android/browser/BrowserSettings.java')

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 8461d3027..39abf3371 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -454,7 +454,12 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
     }
 
     public void resetDefaultPreferences() {
-        mPrefs.edit().clear().apply();
+        // Preserve autologin setting
+        long gal = mPrefs.getLong(GoogleAccountLogin.PREF_AUTOLOGIN_TIME, -1);
+        mPrefs.edit()
+                .clear()
+                .putLong(GoogleAccountLogin.PREF_AUTOLOGIN_TIME, gal)
+                .apply();
         syncManagedSettings();
     }
 
-- 
cgit v1.2.3