commit 4b429417ba9fc0bf5e10f4dda1cf65f8eb473029
author Jason Sams <jsams@google.com> Fri Oct 12 14:30:23 2012 -0700
committer Jason Sams <jsams@google.com> Fri Oct 12 14:30:23 2012 -0700
tree 75349dcaa011927a53b8ac8cce68205739f82a74
parent 3add43ab0e26c9fd44d4dea683092807229eaa59

Fix crash in ImageProcessing blend test

The blend test would use a stale context
when running all tests.

bug 7327728

Change-Id: I5802b9b382d8893419efe86d33fdfeeb27729e31

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

diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blend.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blend.java
index 2920824..2303fc3 100644
--- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blend.java
+++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blend.java
@@ -52,8 +52,10 @@
             new AdapterView.OnItemSelectedListener() {
                 public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
                     currentIntrinsic = pos;
-                    runTest();
-                    act.updateDisplay();
+                    if (mRS != null) {
+                        runTest();
+                        act.updateDisplay();
+                    }
                 }
 
                 public void onNothingSelected(AdapterView parent) {

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

diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java
index 8009daa..bb3f2f3 100644
--- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java
+++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java
@@ -123,6 +123,7 @@
 
     public void destroy() {
         mRS.destroy();
+        mRS = null;
     }
 
     public void updateBitmap(Bitmap b) {