diff options
| author | Jason Sams <jsams@google.com> | 2013-06-01 09:51:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 09:51:46 -0700 |
| commit | 1b1c39d773e7ebf8cb2dca62b3ed1a0727c268e1 (patch) | |
| tree | 76a2adcea97b09b21f6f5364a0b9236514c3c7c4 | |
| parent | 17b2a01ded6a619d73c815c82ed6b3085800437b (diff) | |
| parent | d19068a7d28d129f5a1a1be478e972b40cea04eb (diff) | |
| download | frameworks_base-1b1c39d773e7ebf8cb2dca62b3ed1a0727c268e1.zip frameworks_base-1b1c39d773e7ebf8cb2dca62b3ed1a0727c268e1.tar.gz frameworks_base-1b1c39d773e7ebf8cb2dca62b3ed1a0727c268e1.tar.bz2 | |
am d19068a7: am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
* commit 'd19068a7d28d129f5a1a1be478e972b40cea04eb':
Fix free after use with createFromBitmapResource
| -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 3d4d40a..e1b8c6c 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -1736,6 +1736,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(); @@ -1763,7 +1766,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, |