Move queryBookmarksForUrl to background thread.
Bug 2611964
Change-Id: I8f69ec42fbf880d031cfc2372cffd9719db4e280
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 01424e2..2dac050 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1012,27 +1012,16 @@
public void onReceivedTouchIconUrl(WebView view, String url,
boolean precomposed) {
final ContentResolver cr = mActivity.getContentResolver();
- final Cursor c = BrowserBookmarksAdapter.queryBookmarksForUrl(cr,
- view.getOriginalUrl(), view.getUrl(), true);
- if (c != null) {
- if (c.getCount() > 0) {
- // Let precomposed icons take precedence over non-composed
- // icons.
- if (precomposed && mTouchIconLoader != null) {
- mTouchIconLoader.cancel(false);
- mTouchIconLoader = null;
- }
- // Have only one async task at a time.
- if (mTouchIconLoader == null) {
- mTouchIconLoader = new DownloadTouchIcon(Tab.this, cr,
- c, view);
- mTouchIconLoader.execute(url);
- } else {
- c.close();
- }
- } else {
- c.close();
- }
+ // Let precomposed icons take precedence over non-composed
+ // icons.
+ if (precomposed && mTouchIconLoader != null) {
+ mTouchIconLoader.cancel(false);
+ mTouchIconLoader = null;
+ }
+ // Have only one async task at a time.
+ if (mTouchIconLoader == null) {
+ mTouchIconLoader = new DownloadTouchIcon(Tab.this, cr, view);
+ mTouchIconLoader.execute(url);
}
}