commit 6eac63e78d43d04e31c4d16830c44c4d9df82639
author Leon Scroggins <scroggo@google.com> Mon Mar 15 18:19:14 2010 -0400
committer Leon Scroggins <scroggo@google.com> Wed Mar 17 08:46:53 2010 -0400
tree 42d423e0e98d816a0d44afa9b5249d08fdeee2f3
parent 98d5fce7c687cfcc956b10d44946d31f39b6dc15

Do not destroy the backforward list when doing another voice search.

Fix for http://b/issue?id=2516327

Change-Id: I0daf8ba6e24be6682d849107914877fb0c31ec4f

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 55e5177..4c8fc5c 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -465,11 +465,7 @@
                     // If the WebView has the same original url and is on that
                     // page, it can be reused.
                     boolean needsLoad =
-                            mTabControl.recreateWebView(appTab, urlData.mUrl)
-                            // If there is a voice intent in the UrlData, then
-                            // recreateWebView may return false, but we still
-                            // need to force a load.
-                            || urlData.mVoiceIntent != null;
+                            mTabControl.recreateWebView(appTab, urlData);
 
                     if (current != appTab) {
                         switchToTab(mTabControl.getTabIndex(appTab));
@@ -3934,7 +3930,7 @@
      * A UrlData class to abstract how the content will be set to WebView.
      * This base class uses loadUrl to show the content.
      */
-    private static class UrlData {
+    /* package */ static class UrlData {
         final String mUrl;
         final Map<String, String> mHeaders;
         final Intent mVoiceIntent;