Close the bookmarks cursor.

If no touch icon loader is created, close the cursor immediately. Close the
cursor in doInBackground to ensure that the cursor is closed even in error.

Bug: 2483029

diff --git a/src/com/android/browser/DownloadTouchIcon.java b/src/com/android/browser/DownloadTouchIcon.java
index e2d4594..c8701ba 100644 (file)
--- a/src/com/android/browser/DownloadTouchIcon.java
+++ b/src/com/android/browser/DownloadTouchIcon.java
@@ -96,6 +96,9 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> {
         } finally {
             client.close();
         }
+        if (mCursor != null) {
+            mCursor.close();
+        }
         return null;
     }
 
@@ -130,6 +133,5 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> {
                         values, null, null);
             } while (mCursor.moveToNext());
         }
-        mCursor.close();
     }
 }

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 7e03bbc..7b54e38 100644 (file)
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -975,6 +975,8 @@ class Tab {
                         mTouchIconLoader = new DownloadTouchIcon(Tab.this, cr,
                                 c, view);
                         mTouchIconLoader.execute(url);
+                    } else {
+                        c.close();
                     }
                 } else {
                     c.close();