summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-03-04 11:35:46 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-04 11:35:46 -0800
commite95d75e89eb7da2089bfacc2536c6590ddc29388 (patch)
treeb8b3365b3c1a428174a0d585d7ac340394c8c1d5 /src/com/android
parentb3b04f75a05889ac615f7c7b9cc84e65a9c65d40 (diff)
parent8e9fe327af19df2df03a2546c97604b095acd5e1 (diff)
downloadpackages_apps_Browser-e95d75e89eb7da2089bfacc2536c6590ddc29388.zip
packages_apps_Browser-e95d75e89eb7da2089bfacc2536c6590ddc29388.tar.gz
packages_apps_Browser-e95d75e89eb7da2089bfacc2536c6590ddc29388.tar.bz2
Merge "Close the bookmarks cursor."
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/DownloadTouchIcon.java4
-rw-r--r--src/com/android/browser/Tab.java2
2 files changed, 5 insertions, 1 deletions
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 @@ 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
--- 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();