When free the background tabs due to low memory, keep the parent tab of the
current tab around so that hit Back won't cause reload the page.
This should address the complain of reloading while using Google Reader.
Remove our own checkMemory() as the system now provides onLowMemory().
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index c7c3e3f..c5085b3 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -698,8 +698,10 @@
* WebView cache;
*/
void freeMemory() {
+ if (getTabCount() == 0) return;
+
// free the least frequently used background tab
- Tab t = getLeastUsedTab();
+ Tab t = getLeastUsedTab(getCurrentTab().getParentTab());
if (t != null) {
Log.w(LOGTAG, "Free a tab in the browser");
freeTab(t);
@@ -718,7 +720,7 @@
System.gc();
}
- private Tab getLeastUsedTab() {
+ private Tab getLeastUsedTab(Tab currentParent) {
// Don't do anything if we only have 1 tab.
if (getTabCount() == 1) {
return null;
@@ -734,7 +736,8 @@
}
do {
t = mTabQueue.get(i++);
- } while (i < queueSize && t != null && t.mMainView == null);
+ } while (i < queueSize
+ && ((t != null && t.mMainView == null) || t == currentParent));
// Don't do anything if the last remaining tab is the current one or if
// the last tab has been freed already.