am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches

* commit '37a9333651cead185d982d9b809cb3425a24d3d8':
  Clear cached stitching preview thumbnails.

2 files changed, 26 insertions, 0 deletions

diff --git a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
index 7788e61f5..3c131e591 100644
--- a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
+++ b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
@@ -74,6 +74,7 @@ import java.io.RandomAccessFile;
 import java.nio.ByteOrder;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
+import java.util.Arrays;
 import java.util.zip.Adler32;
 
 public class BlobCache implements Closeable {
@@ -379,6 +380,16 @@ public class BlobCache implements Closeable {
         updateIndexHeader();
     }
 
+    public void clearEntry(long key) throws IOException {
+        if (!lookupInternal(key, mActiveHashStart)) {
+            return; // Nothing to clear
+        }
+        byte[] header = mBlobHeader;
+        Arrays.fill(header, (byte) 0);
+        mActiveDataFile.seek(mFileOffset);
+        mActiveDataFile.write(header);
+    }
+
     // Appends the data to the active file. It also updates the hash entry.
     // The proper hash entry (suitable for insertion or replacement) must be
     // pointed by mSlotOffset.
@@ -485,6 +496,9 @@ public class BlobCache implements Closeable {
                 return false;
             }
             long blobKey = readLong(header, BH_KEY);
+            if (blobKey == 0) {
+                return false; // This entry has been cleared.
+            }
             if (blobKey != req.key) {
                 Log.w(TAG, "blob key does not match: " + blobKey);
                 return false;
diff --git a/src/com/android/gallery3d/data/ImageCacheService.java b/src/com/android/gallery3d/data/ImageCacheService.java
index 38e32cbee..d42e9521d 100644
--- a/src/com/android/gallery3d/data/ImageCacheService.java
+++ b/src/com/android/gallery3d/data/ImageCacheService.java
@@ -91,6 +91,18 @@ public class ImageCacheService {
         }
     }
 
+    public void clearImageData(Path path, int type) {
+        byte[] key = makeKey(path, type);
+        long cacheKey = Utils.crc64Long(key);
+        synchronized (mCache) {
+            try {
+                mCache.clearEntry(cacheKey);
+            } catch (IOException ex) {
+                // ignore.
+            }
+        }
+    }
+
     private static byte[] makeKey(Path path, int type) {
         return GalleryUtils.getBytes(path.toString() + "+" + type);
     }