Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev

Jason Sams · Android (Google) Code Review · commit 73db36e6d8e4 · 2012-10-12T19:00:21.000-07:00
diff --git 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 @@ public class Blend extends TestBase {
             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) {
diff --git 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 finish() {
 
     public void destroy() {
         mRS.destroy();
+        mRS = null;
     }
 
     public void updateBitmap(Bitmap b) {

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ public void finish() {`
`123`	`123`
`124`	`124`	`public void destroy() {`
`125`	`125`	`mRS.destroy();`
	`126`	`+ mRS = null;`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`public void updateBitmap(Bitmap b) {`