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

Commit 63dc7337 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 7f2083fe: am 73db36e6: Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev 

* commit '7f2083fe':
  Fix crash in ImageProcessing blend test
parents bfb29465 7f2083fe

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -52,9 +52,11 @@ public class Blend extends TestBase { 
            new AdapterView.OnItemSelectedListener() {

            new AdapterView.OnItemSelectedListener() {

                public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {

                public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {

                    currentIntrinsic = pos;

                    currentIntrinsic = pos;

                    if (mRS != null) {

                        runTest();

                        runTest();

                        act.updateDisplay();

                        act.updateDisplay();

                    }

                    }

                }





                public void onNothingSelected(AdapterView parent) {

                public void onNothingSelected(AdapterView parent) {

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -123,6 +123,7 @@ public class TestBase { 




    public void destroy() {

    public void destroy() {

        mRS.destroy();

        mRS.destroy();

        mRS = null;

    }

    }





    public void updateBitmap(Bitmap b) {

    public void updateBitmap(Bitmap b) {