Merge pull request #9620 from garymathews/TIMOB-25540

[TIMOB-25540] Android: Fix sizeOf() calculation to prevent IllegalStateException
tidev · Jan 4, 2018 · 158d75e · 158d75e
2 parents 1549847 + 9d70b04
commit 158d75e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiBlobLruCache.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiBlobLruCache.java
@@ -39,13 +39,8 @@ public TiBlobLruCache()
 	@Override
 	protected int sizeOf(String key, Bitmap bitmap)
 	{
-		// The cache size will be measured in kilobytes rather than
-		// number of items.
-		if (android.os.Build.VERSION.SDK_INT > TiC.API_LEVEL_HONEYCOMB) {
-			return bitmap.getByteCount() / 1024;
-		} else {
-			return bitmap.getRowBytes() * bitmap.getHeight() / 1024;
-		}
+		int byteCount = bitmap.getRowBytes() * bitmap.getHeight();
+		return byteCount / 1024;
 	}
 
 	public void addBitmapToMemoryCache(String key, Bitmap bitmap)

diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiImageLruCache.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiImageLruCache.java
@@ -39,12 +39,7 @@ public TiImageLruCache()
 	@Override
 	protected int sizeOf(Integer key, Bitmap bitmap)
 	{
-		// The cache size will be measured in kilobytes rather than
-		// number of items.
-		if (android.os.Build.VERSION.SDK_INT > TiC.API_LEVEL_HONEYCOMB) {
-			return bitmap.getByteCount() / 1024;
-		} else {
-			return bitmap.getRowBytes() * bitmap.getHeight() / 1024;
-		}
+		int byteCount = bitmap.getRowBytes() * bitmap.getHeight();
+		return byteCount / 1024;
 	}
 }