commit a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3
author Daniel Sandler <dsandler@android.com> Thu Dec 01 12:31:50 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 01 12:31:50 2011 -0800
tree e4633ac9d216996e39631c0d4183b488f5fcf149
parent c0715fd58c287347458756e34f07cee1fd72b982
parent 43072a9551c907236a9f0bb4e6506ef0bd5d6c03

Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1

gallerycommon/src/com/android/gallery3d/common/BlobCache.java

diff --git a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
index 19a2e30..7788e61 100644
--- a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
+++ b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
@@ -76,7 +76,7 @@
 import java.nio.channels.FileChannel;
 import java.util.zip.Adler32;
 
-public class BlobCache {
+public class BlobCache implements Closeable {
     private static final String TAG = "BlobCache";
 
     private static final int MAGIC_INDEX_FILE = 0xB3273030;
@@ -171,6 +171,7 @@
 
     // Close the cache. All resources are released. No other method should be
     // called after this is called.
+    @Override
     public void close() {
         syncAll();
         closeAll();

gallerycommon/src/com/android/gallery3d/common/FileCache.java

diff --git a/gallerycommon/src/com/android/gallery3d/common/FileCache.java b/gallerycommon/src/com/android/gallery3d/common/FileCache.java
index a69d6e1..938ef8c 100644
--- a/gallerycommon/src/com/android/gallery3d/common/FileCache.java
+++ b/gallerycommon/src/com/android/gallery3d/common/FileCache.java
@@ -16,8 +16,6 @@
 
 package com.android.gallery3d.common;
 
-import com.android.gallery3d.common.Entry.Table;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -25,10 +23,13 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
+import com.android.gallery3d.common.Entry.Table;
+
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 
-public class FileCache {
+public class FileCache implements Closeable {
     private static final int LRU_CAPACITY = 4;
     private static final int MAX_DELETE_COUNT = 16;
 
@@ -91,6 +92,10 @@
         mDbHelper = new DatabaseHelper(context, dbName);
     }
 
+    public void close() {
+        mDbHelper.close();
+    }
+
     public void store(String downloadUrl, File file) {
         if (!mInitialized) initialize();