diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-21 14:02:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-21 14:02:02 -0700 |
| commit | 02df84a3b1b4f68044d981bb345515ae9419d0c1 (patch) | |
| tree | bf5e03a2cd7c89d614c2e0e37b86b104c79fc43d /tests/RenderScriptTests | |
| parent | 257662efe2a5edd13601b4372b5c1ff0431ddda9 (diff) | |
| parent | 34d8574665caaef52f7c595b57f45f1c9efd7e39 (diff) | |
| download | frameworks_base-02df84a3b1b4f68044d981bb345515ae9419d0c1.zip frameworks_base-02df84a3b1b4f68044d981bb345515ae9419d0c1.tar.gz frameworks_base-02df84a3b1b4f68044d981bb345515ae9419d0c1.tar.bz2 | |
am 34d85746: am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit '34d8574665caaef52f7c595b57f45f1c9efd7e39':
Tests/RS: Add RS context check for RsBalls setAccel()
Diffstat (limited to 'tests/RenderScriptTests')
| -rw-r--r-- | tests/RenderScriptTests/Balls/src/com/example/android/rs/balls/BallsView.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class BallsView extends RSSurfaceView { } void setAccel(float x, float y, float z) { - if (mRender == null) { + if ((mRender == null) || (mRS == null)) { return; } mRender.setAccel(x, -y); |