Merge "Gallery2: Fix can't show the thumbnails when the storage full"

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/data/ImageCacheService.java b/src/com/android/gallery3d/data/ImageCacheService.java
index 1c7cb8c5e..129c113a6 100644
--- a/src/com/android/gallery3d/data/ImageCacheService.java
+++ b/src/com/android/gallery3d/data/ImageCacheService.java
@@ -62,6 +62,9 @@ public class ImageCacheService {
             LookupRequest request = new LookupRequest();
             request.key = cacheKey;
             request.buffer = buffer.data;
+            if (mCache == null) {
+                return false;
+            }
             synchronized (mCache) {
                 if (!mCache.lookup(request)) return false;
             }
@@ -83,6 +86,9 @@ public class ImageCacheService {
         ByteBuffer buffer = ByteBuffer.allocate(key.length + value.length);
         buffer.put(key);
         buffer.put(value);
+        if (mCache == null) {
+            return;
+        }
         synchronized (mCache) {
             try {
                 mCache.insert(cacheKey, buffer.array());
@@ -95,6 +101,9 @@ public class ImageCacheService {
     public void clearImageData(Path path, long timeModified, int type) {
         byte[] key = makeKey(path, timeModified, type);
         long cacheKey = Utils.crc64Long(key);
+        if (mCache == null) {
+            return;
+        }
         synchronized (mCache) {
             try {
                 mCache.clearEntry(cacheKey);