commit d25c865122648a6098428c9161a1f3488a4aa9b4
author John Reck <jreck@google.com> Fri Jul 29 10:40:31 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 10:40:31 2011 -0700
tree 88737e7693a097041f2523a8a338162ee18ffc86
parent 81570d16d528097aff442da41688ca6bc226a6fa
parent 6a9afa94e282efa9f6f44b02be54e384765d853c

Merge "Allow suggestions to span 2 lines"

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 8461d30..39abf33 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -454,7 +454,12 @@
     }
 
     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();
     }
 

src/com/android/browser/CrashRecoveryHandler.java

diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java
index fdcdbc6..319ff89 100644
--- a/src/com/android/browser/CrashRecoveryHandler.java
+++ b/src/com/android/browser/CrashRecoveryHandler.java
@@ -243,11 +243,13 @@
             mRecoveryState = loadCrashState();
             mShouldPrompt = shouldPrompt();
         }
-        if (mShouldPrompt) {
-            promptToRecover(mRecoveryState, intent);
-            return;
-        } else {
-            updateLastRecovered();
+        if (mRecoveryState != null && !mRecoveryState.isEmpty()) {
+            if (mShouldPrompt) {
+                promptToRecover(mRecoveryState, intent);
+                return;
+            } else {
+                updateLastRecovered();
+            }
         }
         mController.doStart(mRecoveryState, intent);
         mRecoveryState = null;