diff options
| author | Jason Sams <jsams@google.com> | 2012-09-23 11:02:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-23 11:02:11 -0700 |
| commit | 067af95257e1f8007a3a1777c257760aed9947af (patch) | |
| tree | 5bb1a959644d59fd04d6fb4ea0da4d9376963e4e /tests | |
| parent | a91c9f9f7a3c5d09333bdf27ef06012bb4e7d710 (diff) | |
| parent | ed0b4f961f04ebf12cf900f4ce2d94e4473bf40b (diff) | |
| download | frameworks_base-067af95257e1f8007a3a1777c257760aed9947af.zip frameworks_base-067af95257e1f8007a3a1777c257760aed9947af.tar.gz frameworks_base-067af95257e1f8007a3a1777c257760aed9947af.tar.bz2 | |
Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java | 3 | ||||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java index 5311399..c171a64 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java @@ -133,6 +133,9 @@ public class ImageProcessingActivity extends Activity void changeTest(int testID) { + if (mTest != null) { + mTest.destroy(); + } switch(testID) { case 0: mTest = new LevelsV4(false, false); 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 3a6241d..6885181 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/TestBase.java @@ -108,6 +108,10 @@ public class TestBase { mRS.finish(); } + public void destroy() { + mRS.destroy(); + } + public void updateBitmap(Bitmap b) { mOutPixelsAllocation.copyTo(b); } |