After some discussion, it's come to light that bug 896515 isn't quite what we're after in a session restore pref. Partly because the fundamental problem we want to solve here is letting users decide what should happen when they *manually* quit and restart Firefox, and partly because it looks kind of bad to have an option that reads "In the event of a crash, do this"... As such, let's switch to a 2 stage pref like this: -------------------------------------------------------------- [Title] Tabs [Options] - Always restore - Don't restore after quitting Firefox -------------------------------------------------------------- Desired behaviour for both of these options: Always restore - Killed by OS: restore tabs - Killed by a crash: restore tabs - Killed manually: restore tabs Don't restore after quitting Firefox - Killed by OS: restore tabs - Killed by a crash: restore tabs - Killed manually: do not restore tabs -- this is the only difference in behaviour for this pref ----- Lastly, we should probably back the current pref out of Aurora, so we don't end up in a place where we launch the feature with one wording and change it a single release later.

Previous implementation is on the mozilla-25 train; should this target that? Setting flags appropriately.

(In reply to Ian Barlow (:ibarlow) from comment #0) > Lastly, we should probably back the current pref out of Aurora, so we don't > end up in a place where we launch the feature with one wording and change it > a single release later. Filed bug 905371.

(In reply to Aaron Train [:aaronmt] from comment #1) > Previous implementation is on the mozilla-25 train; should this target that? > > Setting flags appropriately. Since bug 905371 was filed, this one can be about only changing the pref to two states in Fx26 (note that this bug unfortunately can't be uplifted to Aurora due to string changes).

Comment on attachment 790876 [details] [diff] [review] Change session restore pref to have two states >diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java >+ } else if (savedInstanceState != null || PreferenceManager.getDefaultSharedPreferences(this) >+ .getString(GeckoPreferences.PREFS_RESTORE_SESSION, "quit") >+ .equals("always")) { This is a bit hairy, but it is optimized so we don't call the code unless we really need to check it

Off-topic: I noticed the ThreadUtils.postToBackgroundThread usage in this area could use *any* background thread, not only the DB one.

Follow-up to update tests: https://hg.mozilla.org/integration/fx-team/rev/70158737f9ab

https://hg.mozilla.org/mozilla-central/rev/69ef645c0690 https://hg.mozilla.org/mozilla-central/rev/70158737f9ab

I realize the bug has been committed, but more positive wording for "Don't restore after quitting Firefox" would be "Restore after OS restart only". It would still include crashes, but wouldn't have to be explicitly stated.

Verified fixed on: Build: Firefox for Android 26.0a2 (2013-09-18) Device: Samsung Galaxy R OS: Android 2.3

Created test cases in moztrap: https://moztrap.mozilla.org/manage/cases/?filter-suite=415