diff options
author | Michael W <baddaemon87@gmail.com> | 2016-06-07 21:05:00 +0200 |
---|---|---|
committer | Adrian DC <radian.dc@gmail.com> | 2016-12-03 22:23:10 +0100 |
commit | be40ea1d88509a2f51e349dbc74c6e7371c85424 (patch) | |
tree | 3d62befa489e89068dea781e06c157fe1ed0dead | |
parent | 6ce75773d9e95b2e170ab33d6ecdbc9781a84888 (diff) | |
download | android_packages_apps_Gallery2-be40ea1d88509a2f51e349dbc74c6e7371c85424.tar.gz android_packages_apps_Gallery2-be40ea1d88509a2f51e349dbc74c6e7371c85424.tar.bz2 android_packages_apps_Gallery2-be40ea1d88509a2f51e349dbc74c6e7371c85424.zip |
Gallery: Remove more possible NPEs
getCache can return null ->
check this before proceeding
RM-290
Change-Id: I834780a4dafbe22f2d345fe5571cb20f3f3e5e2e
-rwxr-xr-x | src/com/android/gallery3d/app/MoviePlayer.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/ImageCacheService.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 2ef7c2e85..e0ee2ade6 100755 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -1658,6 +1658,7 @@ class Bookmarker { BlobCache cache = CacheManager.getCache(mContext, BOOKMARK_CACHE_FILE, BOOKMARK_CACHE_MAX_ENTRIES, BOOKMARK_CACHE_MAX_BYTES, BOOKMARK_CACHE_VERSION); + if (cache == null) return null; byte[] data = cache.lookup(uri.hashCode()); if (data == null) return null; diff --git a/src/com/android/gallery3d/data/ImageCacheService.java b/src/com/android/gallery3d/data/ImageCacheService.java index 1c7cb8c5e..9d3a6251c 100644 --- a/src/com/android/gallery3d/data/ImageCacheService.java +++ b/src/com/android/gallery3d/data/ImageCacheService.java @@ -56,6 +56,8 @@ public class ImageCacheService { * @return true if the image data is found; false if not found. */ public boolean getImageData(Path path, long timeModified, int type, BytesBuffer buffer) { + if (mCache == null) return false; + byte[] key = makeKey(path, timeModified, type); long cacheKey = Utils.crc64Long(key); try { @@ -78,6 +80,8 @@ public class ImageCacheService { } public void putImageData(Path path, long timeModified, int type, byte[] value) { + if (mCache == null) return; + byte[] key = makeKey(path, timeModified, type); long cacheKey = Utils.crc64Long(key); ByteBuffer buffer = ByteBuffer.allocate(key.length + value.length); @@ -93,6 +97,8 @@ public class ImageCacheService { } public void clearImageData(Path path, long timeModified, int type) { + if (mCache == null) return; + byte[] key = makeKey(path, timeModified, type); long cacheKey = Utils.crc64Long(key); synchronized (mCache) { |