Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev

Browse Source
This commit is contained in:
Jason Sams
2013-06-01 00:54:17 +00:00
committed by Android (Google) Code Review
parent 51e01f9ec0 3ece2f3268
commit 413adc9260
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/renderscript/Allocation.java
View File

@@ -1650,6 +1650,9 @@ public class Allocation extends BaseObj {
int usage) { int usage) {
rs.validate(); rs.validate();
if ((usage & (USAGE_SHARED | USAGE_IO_INPUT | USAGE_IO_OUTPUT)) != 0) {
throw new RSIllegalArgumentException("Unsupported usage specified.");
}
Bitmap b = BitmapFactory.decodeResource(res, id); Bitmap b = BitmapFactory.decodeResource(res, id);
Allocation alloc = createFromBitmap(rs, b, mips, usage); Allocation alloc = createFromBitmap(rs, b, mips, usage);
b.recycle(); b.recycle();
@@ -1677,7 +1680,7 @@ public class Allocation extends BaseObj {
if (rs.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) { if (rs.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) {
return createFromBitmapResource(rs, res, id, return createFromBitmapResource(rs, res, id,
MipmapControl.MIPMAP_NONE, MipmapControl.MIPMAP_NONE,
USAGE_SHARED | USAGE_SCRIPT | USAGE_GRAPHICS_TEXTURE); USAGE_SCRIPT | USAGE_GRAPHICS_TEXTURE);
} }
return createFromBitmapResource(rs, res, id, return createFromBitmapResource(rs, res, id,
MipmapControl.MIPMAP_NONE, MipmapControl.MIPMAP_NONE,