summaryrefslogtreecommitdiffstats
path: root/tests/RenderScriptTests/Balls
diff options
context:
space:
mode:
authorYong Chen <yong.a.chen@intel.com>2012-07-20 10:35:36 +0800
committerShuo Gao <shuo.gao@intel.com>2012-08-17 10:04:21 +0800
commitda1c93ae4d27b73ea983370520a7a739226f1695 (patch)
treeeda0b64cea1239a62dd8ae4f883b3ef7af3e7872 /tests/RenderScriptTests/Balls
parenta950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9 (diff)
downloadframeworks_base-da1c93ae4d27b73ea983370520a7a739226f1695.zip
frameworks_base-da1c93ae4d27b73ea983370520a7a739226f1695.tar.gz
frameworks_base-da1c93ae4d27b73ea983370520a7a739226f1695.tar.bz2
Tests/RS: Add RS context check for RsBalls setAccel()
mRS could be null when lock and unlock screen by pressing power key several times, it causes RsBalls crash. Add null pointer check to fix. Change-Id: If37dee8609420daaff17772d5194cad5531f98e6 Author: Yong Chen <yong.a.chen@intel.com> Signed-off-by: Yong Chen <yong.a.chen@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 31271
Diffstat (limited to 'tests/RenderScriptTests/Balls')
-rw-r--r--tests/RenderScriptTests/Balls/src/com/example/android/rs/balls/BallsView.java2
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);