From 1dd8e82b74b1055fcd572e820a724997550edd33 Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Wed, 3 Aug 2011 14:34:29 +0100
Subject: Remove preloaded URLs from back stack when preloading fails.

Bug: 5114365
Change-Id: Iaef0c062ac1ee2ea6e3cde8699d67a0cc4ff1a56
---
 src/com/android/browser/PreloadedTabControl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '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 @@ public class PreloadedTabControl {
                 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;
     }
-- 
cgit v1.1