Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-25540] Android: Fix sizeOf() calculation to prevent IllegalStateException #9620

Merged
merged 7 commits into from
Jan 4, 2018
Merged

[TIMOB-25540] Android: Fix sizeOf() calculation to prevent IllegalStateException #9620

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71d7c26
[TIMOB-25540] Fix sizeOf() calculation to prevent IllegalStateException
Nov 20, 2017
38825ac
[TIMOB-25540] Amend sizeOf in TiBlobLruCache and TiImageLruCach
Nov 21, 2017
267231f
Merge branch 'master' into TIMOB-25540
garymathews Dec 15, 2017
999cdf6
Merge branch 'master' into TIMOB-25540
ssjsamir Dec 20, 2017
a65a65a
Merge branch 'master' into TIMOB-25540
ssjsamir Dec 20, 2017
4e04b65
Merge branch 'master' into TIMOB-25540
ssjsamir Dec 27, 2017
9d70b04
Merge branch 'master' into TIMOB-25540
ssjsamir Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions android/titanium/src/java/org/appcelerator/titanium/util/TiBlobLruCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 2 additions & 7 deletions android/titanium/src/java/org/appcelerator/titanium/util/TiImageLruCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}