summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/PreloadedTabControl.java
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2011-08-03 14:34:29 +0100
committerMathew Inwood <mathewi@google.com>2011-08-03 18:01:05 +0100
commit1dd8e82b74b1055fcd572e820a724997550edd33 (patch)
treeebcac1886897b76a36ad5101341976de5ae1d79c /src/com/android/browser/PreloadedTabControl.java
parent7cff891f31311139e215e3948198843bcafd6137 (diff)
downloadpackages_apps_browser-1dd8e82b74b1055fcd572e820a724997550edd33.zip
packages_apps_browser-1dd8e82b74b1055fcd572e820a724997550edd33.tar.gz
packages_apps_browser-1dd8e82b74b1055fcd572e820a724997550edd33.tar.bz2
Remove preloaded URLs from back stack when preloading fails.
Bug: 5114365 Change-Id: Iaef0c062ac1ee2ea6e3cde8699d67a0cc4ff1a56
Diffstat (limited to 'src/com/android/browser/PreloadedTabControl.java')
-rw-r--r--src/com/android/browser/PreloadedTabControl.java3
1 files changed, 2 insertions, 1 deletions
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;
}