| commit | 34d8574665caaef52f7c595b57f45f1c9efd7e39 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 21 14:00:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 21 14:00:11 2012 -0700 |
| tree | ff6c29dbd94c72ec02c80510a4972a8524dff29c | |
| parent | f96fcd5095e751fc9402d8bbecdf59f53e00d854 [diff] | |
| parent | b8da225f26b689288710ff0eafefa906b4f5700f [diff] |
am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" * commit 'b8da225f26b689288710ff0eafefa906b4f5700f': Tests/RS: Add RS context check for RsBalls setAccel()
diff --git a/tests/RenderScriptTests/Balls/src/com/example/android/rs/balls/BallsView.java b/tests/RenderScriptTests/Balls/src/com/example/android/rs/balls/BallsView.java index b3b3756..041782d 100644 --- a/tests/RenderScriptTests/Balls/src/com/example/android/rs/balls/BallsView.java +++ b/tests/RenderScriptTests/Balls/src/com/example/android/rs/balls/BallsView.java
@@ -105,7 +105,7 @@ } void setAccel(float x, float y, float z) { - if (mRender == null) { + if ((mRender == null) || (mRS == null)) { return; } mRender.setAccel(x, -y);