Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 413adc92 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

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

parents 51e01f9e 3ece2f32

graphics/java/android/renderscript/Allocation.java

+4 −1
Original line number Diff line number Diff line
@@ -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,