From c33eee56b585929499dd34435f07257db4f5c245 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 11 Oct 2012 09:51:32 -0700
Subject: Clear cached stitching preview thumbnails.

 Bug 7328408

Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
---
 .../src/com/android/gallery3d/common/BlobCache.java        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'gallerycommon/src/com/android/gallery3d')

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;
-- 
cgit v1.2.3