summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserSettings.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-07-29 10:05:47 -0700
committerJohn Reck <jreck@google.com>2011-07-29 10:06:29 -0700
commitbd3151980baf8a7d3a13f735f4a7f2001d397e72 (patch)
tree406c60fbe1e95f6ba982cde888da41d7ceedd601 /src/com/android/browser/BrowserSettings.java
parent10aa4bd07ad26c4797abc1bc85e71bd49a6299b7 (diff)
downloadpackages_apps_Browser-bd3151980baf8a7d3a13f735f4a7f2001d397e72.tar.gz
packages_apps_Browser-bd3151980baf8a7d3a13f735f4a7f2001d397e72.tar.bz2
packages_apps_Browser-bd3151980baf8a7d3a13f735f4a7f2001d397e72.zip
Fix resetting defaults triggering prelogin
Bug: 4163516 Change-Id: I0a64ab19469c25f8c267699fd6bce4fb599f78f9
Diffstat (limited to 'src/com/android/browser/BrowserSettings.java')
-rw-r--r--src/com/android/browser/BrowserSettings.java7
1 files changed, 6 insertions, 1 deletions
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();
}