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

Commit afa528e4 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Fix app bug related to same input/output bitmap."

parents 91c7bc2a b6d04f84

tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public class ImageProcessingActivity extends Activity 
            break;

        }



        mTest.createBaseTest(this, mBitmapIn, mBitmapIn2);

        mTest.createBaseTest(this, mBitmapIn, mBitmapIn2, mBitmapOut);

        setupBars();



        mTest.runTest();

tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class TestBase { 
        return false;

    }



    public final void createBaseTest(ImageProcessingActivity ipact, Bitmap b, Bitmap b2) {

    public final void createBaseTest(ImageProcessingActivity ipact, Bitmap b, Bitmap b2, Bitmap outb) {

        act = ipact;

        mRS = RenderScript.create(act);

        mRS.setMessageHandler(new MessageProcessor(act));
@@ -117,7 +117,7 @@ public class TestBase { 
        mInPixelsAllocation2 = Allocation.createFromBitmap(mRS, b2,

                                                          Allocation.MipmapControl.MIPMAP_NONE,

                                                          Allocation.USAGE_SCRIPT);

        mOutPixelsAllocation = Allocation.createFromBitmap(mRS, b,

        mOutPixelsAllocation = Allocation.createFromBitmap(mRS, outb,

                                                           Allocation.MipmapControl.MIPMAP_NONE,

                                                           Allocation.USAGE_SCRIPT);

        createTest(act.getResources());