commit a03bbce2a5ea3ea49f701ecc57832ad90d10ea31
author Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 21:40:44 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jun 23 21:40:44 2009 -0700
tree a526d8e579562234e7cd03acba032c8e538d5eb7
parent 92b1c4b120ddc406a2206b5e26aa782146eb285a
parent d1c2a433c79451aac4340aef8f0d83081977df84

am d1c2a433: Merge change 5160 into donut

Merge commit 'd1c2a433c79451aac4340aef8f0d83081977df84'

* commit 'd1c2a433c79451aac4340aef8f0d83081977df84':
  Return the url of a browser history item in the intent query column of the

src/com/android/browser/BrowserProvider.java

diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java
index cf3ed08..7a1e5cb 100644
--- a/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@ -496,7 +496,11 @@
 
                     case SUGGEST_COLUMN_QUERY_ID:
                         if (mHistoryCount > mPos) {
-                            return null;
+                            // Return the url in the intent query column. This is ignored
+                            // within the browser because our searchable is set to
+                            // android:searchMode="queryRewriteFromData", but it is used by
+                            // global search for query rewriting.
+                            return mHistoryCursor.getString(1);
                         } else if (!mBeyondCursor) {
                             if (mSuggestQueryId == -1) return null;
                             return mSuggestCursor.getString(mSuggestQueryId);