Bug 888053 - Fix for Cursor leak in TopSitesView.java. r=bnicholson

This commit is contained in:
Chris Kitching 2013-07-02 15:49:07 -04:00
parent 1f051cd67a
commit 8247f99fb3

View File

@ -650,17 +650,23 @@ public class TopSitesView extends GridView {
List<String> urls = new ArrayList<String>();
urls.add(holder.getUrl());
Cursor c = BrowserDB.getThumbnailsForUrls(resolver, urls);
if (c == null || !c.moveToFirst()) {
return null;
}
final byte[] b = c.getBlob(c.getColumnIndexOrThrow(Thumbnails.DATA));
Bitmap bitmap = null;
if (b != null && b.length > 0) {
bitmap = BitmapUtils.decodeByteArray(b);
Cursor c = null;
try {
c = BrowserDB.getThumbnailsForUrls(resolver, urls);
if (c != null && c.moveToFirst()) {
final byte[] b = c.getBlob(c.getColumnIndexOrThrow(Thumbnails.DATA));
if (b != null && b.length > 0) {
bitmap = BitmapUtils.decodeByteArray(b);
}
}
} finally {
if (c != null) {
c.close();
}
}
c.close();
return bitmap;
}