commit 1dd8e82b74b1055fcd572e820a724997550edd33
author Mathew Inwood <mathewi@google.com> Wed Aug 03 14:34:29 2011 +0100
committer Mathew Inwood <mathewi@google.com> Wed Aug 03 18:01:05 2011 +0100
tree ebcac1886897b76a36ad5101341976de5ae1d79c
parent 7cff891f31311139e215e3948198843bcafd6137

Remove preloaded URLs from back stack when preloading fails.

Bug: 5114365
Change-Id: Iaef0c062ac1ee2ea6e3cde8699d67a0cc4ff1a56

src/com/android/browser/PreloadedTabControl.java

diff --git a/src/com/android/browser/PreloadedTabControl.java b/src/com/android/browser/PreloadedTabControl.java
index d2482a4..824c00b 100644
--- a/src/com/android/browser/PreloadedTabControl.java
+++ b/src/com/android/browser/PreloadedTabControl.java
@@ -82,8 +82,9 @@
                 if (!called) {
                     if (LOGD_ENABLED) Log.d(LOGTAG, "Query not submitted; falling back");
                     loadUrl(fallbackUrl, fallbackHeaders);
+                    // make sure that the failed, preloaded URL is cleared from the back stack
+                    mTab.clearBackStackWhenItemAdded(fallbackUrl);
                 }
-                mTab.getWebView().clearHistory();
             }});
         return true;
     }