am 34d8574: am b8da225: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"

Jean-Baptiste Queru · Android Git Automerger · commit 02df84a3b1b4 · 2012-08-21T14:02:02.000-07:00
* commit '34d8574665caaef52f7c595b57f45f1c9efd7e39':
  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
@@ -105,7 +105,7 @@ public boolean onTouchEvent(MotionEvent ev)
     }
 
     void setAccel(float x, float y, float z) {
-        if (mRender == null) {
+        if ((mRender == null) || (mRS == null)) {
             return;
         }
         mRender.setAccel(x, -y);

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public boolean onTouchEvent(MotionEvent ev)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`void setAccel(float x, float y, float z) {`
`108`		`- if (mRender == null) {`
	`108`	`+ if ((mRender == null) \|\| (mRS == null)) {`
`109`	`109`	`return;`
`110`	`110`	`}`
`111`	`111`	`mRender.setAccel(x, -y);`