diff options
| author | Jason Sams <jsams@google.com> | 2013-05-31 14:00:46 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2013-05-31 14:01:04 -0700 |
| commit | 3ece2f3268a0629383b37604d0712e3f48968ad9 (patch) | |
| tree | 0776dd1e47ec6f79da05851518d4a893a731ad49 /graphics | |
| parent | 0dc7891ccb9698aa5d1f8b40aff797184c0544aa (diff) | |
| download | frameworks_base-3ece2f3268a0629383b37604d0712e3f48968ad9.zip frameworks_base-3ece2f3268a0629383b37604d0712e3f48968ad9.tar.gz frameworks_base-3ece2f3268a0629383b37604d0712e3f48968ad9.tar.bz2 | |
Fix free after use with createFromBitmapResource
Bug 9227350
Change-Id: Iee7610a9bf3d9d1baf14b968aed2a7d0876d2af7
Diffstat (limited to 'graphics')
| -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 773328c..8ba09e0 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, |