Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Sams
2012-10-12 19:00:19 -07:00
committed by Android (Google) Code Review
parent f402fa4625 4b429417ba
commit 73db36e6d8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,10 @@ 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;
runTest(); if (mRS != null) {
act.updateDisplay(); runTest();
act.updateDisplay();
}
} }
public void onNothingSelected(AdapterView parent) { public void onNothingSelected(AdapterView parent) {

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

@@ -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) {