diff options
author | Michael W <baddaemon87@gmail.com> | 2016-06-04 16:10:05 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-03-10 07:20:09 +0100 |
commit | 75fc80ba7ddea3ad08acc1b59857d87165c1228b (patch) | |
tree | c2a5e248f00904d265a5d7b7b34a83372a11cdd9 | |
parent | 93851fffb0ef9133c7bc068395192f6cbc86f450 (diff) | |
download | android_packages_apps_Gallery2-75fc80ba7ddea3ad08acc1b59857d87165c1228b.tar.gz android_packages_apps_Gallery2-75fc80ba7ddea3ad08acc1b59857d87165c1228b.tar.bz2 android_packages_apps_Gallery2-75fc80ba7ddea3ad08acc1b59857d87165c1228b.zip |
Gallery2: Make sure no NPE happens
Fix for the case when getExternalCacheDir returns null
Change-Id: I15f4a4a37ac44d70d14ac08cd743d3327f91dde1
-rw-r--r-- | src/com/android/gallery3d/util/CacheManager.java | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/util/CacheManager.java b/src/com/android/gallery3d/util/CacheManager.java index ba466f79b..0e8f3e7d3 100644 --- a/src/com/android/gallery3d/util/CacheManager.java +++ b/src/com/android/gallery3d/util/CacheManager.java @@ -46,13 +46,15 @@ public class CacheManager { BlobCache cache = sCacheMap.get(filename); if (cache == null) { File cacheDir = context.getExternalCacheDir(); - String path = cacheDir.getAbsolutePath() + "/" + filename; - try { - cache = new BlobCache(path, maxEntries, maxBytes, false, - version); - sCacheMap.put(filename, cache); - } catch (IOException e) { - Log.e(TAG, "Cannot instantiate cache!", e); + if (cacheDir != null) { + String path = cacheDir.getAbsolutePath() + "/" + filename; + try { + cache = new BlobCache(path, maxEntries, maxBytes, false, + version); + sCacheMap.put(filename, cache); + } catch (IOException e) { + Log.e(TAG, "Cannot instantiate cache!", e); + } } } return cache; @@ -73,10 +75,12 @@ public class CacheManager { pref.edit().putInt(KEY_CACHE_UP_TO_DATE, 1).commit(); File cacheDir = context.getExternalCacheDir(); - String prefix = cacheDir.getAbsolutePath() + "/"; + if (cacheDir != null) { + String prefix = cacheDir.getAbsolutePath() + "/"; - BlobCache.deleteFiles(prefix + "imgcache"); - BlobCache.deleteFiles(prefix + "rev_geocoding"); - BlobCache.deleteFiles(prefix + "bookmark"); + BlobCache.deleteFiles(prefix + "imgcache"); + BlobCache.deleteFiles(prefix + "rev_geocoding"); + BlobCache.deleteFiles(prefix + "bookmark"); + } } } |