diff options
| author | Jason Sams <jsams@google.com> | 2013-06-01 08:23:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 08:23:22 -0700 |
| commit | d19068a7d28d129f5a1a1be478e972b40cea04eb (patch) | |
| tree | ff2a9324fc0b7de8691bea63b8fb1640062deac9 /graphics/java/android/renderscript/Allocation.java | |
| parent | 14fa7fe20fbff7cfcc5daf0a1dce74a296fe3f86 (diff) | |
| parent | 413adc9260d700bd8143950951c4e1ad07cbeddf (diff) | |
am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
* commit '413adc9260d700bd8143950951c4e1ad07cbeddf':
Fix free after use with createFromBitmapResource
Diffstat (limited to 'graphics/java/android/renderscript/Allocation.java')
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 773328c069bf..8ba09e07ff4b 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -1650,6 +1650,9 @@ public class Allocation extends BaseObj { int usage) { 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); Allocation alloc = createFromBitmap(rs, b, mips, usage); b.recycle(); @@ -1677,7 +1680,7 @@ public class Allocation extends BaseObj { if (rs.getApplicationContext().getApplicationInfo().targetSdkVersion >= 18) { return createFromBitmapResource(rs, res, id, MipmapControl.MIPMAP_NONE, - USAGE_SHARED | USAGE_SCRIPT | USAGE_GRAPHICS_TEXTURE); + USAGE_SCRIPT | USAGE_GRAPHICS_TEXTURE); } return createFromBitmapResource(rs, res, id, MipmapControl.MIPMAP_NONE, |