commit e95d75e89eb7da2089bfacc2536c6590ddc29388
author Patrick Scott <phanna@android.com> Thu Mar 04 11:35:46 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 04 11:35:46 2010 -0800
tree b8b3365b3c1a428174a0d585d7ac340394c8c1d5
parent b3b04f75a05889ac615f7c7b9cc84e65a9c65d40
parent 8e9fe327af19df2df03a2546c97604b095acd5e1

Merge "Close the bookmarks cursor."

src/com/android/browser/DownloadTouchIcon.java

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

src/com/android/browser/Tab.java

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