Guard against setting detail textures after destroy.
Change-Id: I0c375a05cbd44d354ea0439b5aecee59a1306ce3
diff --git a/carousel/java/com/android/ex/carousel/CarouselController.java b/carousel/java/com/android/ex/carousel/CarouselController.java
index 9f3444e..669acd9 100644
--- a/carousel/java/com/android/ex/carousel/CarouselController.java
+++ b/carousel/java/com/android/ex/carousel/CarouselController.java
@@ -308,7 +308,7 @@
*/
public void setDetailTextureForItem(int n, float offx, float offy, float loffx, float loffy,
Bitmap bitmap) {
- if (mRenderScript != null) {
+ if (mRenderScript != null && mRS != null) {
if (DBG) Log.v(TAG, "setDetailTextureForItem(" + n + ")");
mRenderScript.setDetailTexture(n, offx, offy, loffx, loffy, bitmap);
if (DBG) Log.v(TAG, "done");
diff --git a/carousel/java/com/android/ex/carousel/CarouselView.java b/carousel/java/com/android/ex/carousel/CarouselView.java
index a636143..4d0fcbf 100644
--- a/carousel/java/com/android/ex/carousel/CarouselView.java
+++ b/carousel/java/com/android/ex/carousel/CarouselView.java
@@ -363,7 +363,7 @@
*/
public void setDetailTextureForItem(int n, float offx, float offy, float loffx, float loffy,
Bitmap bitmap) {
- if (mRenderScript != null) {
+ if (mRenderScript != null && mRS != null) {
if (DBG) Log.v(TAG, "setDetailTextureForItem(" + n + ")");
mRenderScript.setDetailTexture(n, offx, offy, loffx, loffy, bitmap);
if (DBG) Log.v(TAG, "done");
diff --git a/carousel/java/com/android/ex/carousel/MVCCarouselView.java b/carousel/java/com/android/ex/carousel/MVCCarouselView.java
index 8368242..bf093c5 100644
--- a/carousel/java/com/android/ex/carousel/MVCCarouselView.java
+++ b/carousel/java/com/android/ex/carousel/MVCCarouselView.java
@@ -107,8 +107,8 @@
mRenderScript = new CarouselRS(mRS, mContext.getResources(),
getRenderScriptInfo().resId);
mRenderScript.resumeRendering();
- mController.setRS(mRS, mRenderScript);
}
+ mController.setRS(mRS, mRenderScript);
}
@Override
@@ -460,6 +460,7 @@
mRS = null;
destroyRenderScript();
}
+ mController.setRS(mRS, mRenderScript);
}
@Override