summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-12-10 10:22:28 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-10 10:22:28 -0800
commit523772b2af82b8a9a7e7af02ac21601830c39bf1 (patch)
tree44c2cd6b4492f7afbf57c24d1bf9523cb743a4a0 /src
parent7c6af0a8dda02b4f56d258807873477d1b00ba28 (diff)
parent7fa9bb35acad5b02baf7d4f8401a318735191203 (diff)
downloadpackages_apps_Browser-523772b2af82b8a9a7e7af02ac21601830c39bf1.zip
packages_apps_Browser-523772b2af82b8a9a7e7af02ac21601830c39bf1.tar.gz
packages_apps_Browser-523772b2af82b8a9a7e7af02ac21601830c39bf1.tar.bz2
Merge "Fixes adding 2 entries to history on search"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/IntentHandler.java14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 040af81..0b47668 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -222,19 +222,6 @@ public class IntentHandler {
// But currently, we get the user-typed URL from search box as well.
url = UrlUtils.fixUrl(url);
url = UrlUtils.smartUrlFilter(url);
- final ContentResolver cr = mActivity.getContentResolver();
- final String newUrl = url;
- if (mTabControl == null
- || mTabControl.getCurrentWebView() == null
- || !mTabControl.getCurrentWebView().isPrivateBrowsingEnabled()) {
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... unused) {
- Browser.updateVisitedHistory(cr, newUrl, false);
- return null;
- }
- }.execute();
- }
String searchSource = "&source=android-" + GOOGLE_SEARCH_SOURCE_SUGGEST + "&";
if (url.contains(searchSource)) {
String source = null;
@@ -311,7 +298,6 @@ public class IntentHandler {
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... unused) {
- Browser.updateVisitedHistory(cr, newUrl, false);
Browser.addSearchUrl(cr, newUrl);
return null;
}