commit abf6b6f77ec681ee8f90e37cec6d6bb78cb716c0
author Guang Zhu <guangzhu@google.com> Wed Mar 24 13:48:25 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 24 13:48:25 2010 -0700
tree 547f5c68104459c76c22e39fab532854c5e0ac95
parent 8d06e36fe80f516e04ad33ff8b446720e36cabfd
parent c5b6ba019f00b5f83b3b6838fc7d0bd08bb84dd7

Merge "Prevent HTTP auth dialog from shwoing during test"

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1f15186..ff16e4e 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -597,8 +597,15 @@
             return false;
         }
 
-        Browser.updateVisitedHistory(mResolver, url, false);
-        Browser.addSearchUrl(mResolver, url);
+        final ContentResolver cr = mResolver;
+        final String newUrl = url;
+        new AsyncTask<Void, Void, Void>() {
+            protected Void doInBackground(Void... unused) {
+                Browser.updateVisitedHistory(cr, newUrl, false);
+                Browser.addSearchUrl(cr, newUrl);
+                return null;
+            }
+        }.execute();
 
         Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
         intent.addCategory(Intent.CATEGORY_DEFAULT);
@@ -651,7 +658,14 @@
                     // But currently, we get the user-typed URL from search box as well.
                     url = fixUrl(url);
                     url = smartUrlFilter(url);
-                    Browser.updateVisitedHistory(mResolver, url, false);
+                    final ContentResolver cr = mResolver;
+                    final String newUrl = url;
+                    new AsyncTask<Void, Void, Void>() {
+                        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;

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index a5dc975..d450b50 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -657,8 +657,14 @@
                     url = url.substring(0, index-1);
                 }
             }
-            Browser.updateVisitedHistory(mActivity.getContentResolver(), url,
-                    true);
+            final ContentResolver cr = mActivity.getContentResolver();
+            final String newUrl = url;
+            new AsyncTask<Void, Void, Void>() {
+                protected Void doInBackground(Void... unused) {
+                    Browser.updateVisitedHistory(cr, newUrl, true);
+                    return null;
+                }
+            }.execute();
             WebIconDatabase.getInstance().retainIconForPageUrl(url);
         }