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

Commit 1b1c39d7 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am d19068a7: am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 

* commit 'd19068a7':
  Fix free after use with createFromBitmapResource
parents 17b2a01d d19068a7

graphics/java/android/renderscript/Allocation.java

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