summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-01 15:35:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-01 15:35:52 -0700
commitb288ba8e580746ef95b1b04caa2848152fc384a4 (patch)
tree19a7b5816469c9358cf1195b7a1a07aa1228dec3
parent418d4d3450c88967c71691069983b27f8f6bb05f (diff)
parentc58fe396fb7c6208740fa22a005e94a358b8266f (diff)
downloadandroid_packages_apps_Gallery2-b288ba8e580746ef95b1b04caa2848152fc384a4.tar.gz
android_packages_apps_Gallery2-b288ba8e580746ef95b1b04caa2848152fc384a4.tar.bz2
android_packages_apps_Gallery2-b288ba8e580746ef95b1b04caa2848152fc384a4.zip
am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
* commit 'c58fe396fb7c6208740fa22a005e94a358b8266f': Remove OnFrameAvailableListener in tear down
-rw-r--r--src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java b/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
index ee5fe3dcb..1930e3877 100644
--- a/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
+++ b/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
@@ -60,6 +60,7 @@ public abstract class SurfaceTextureScreenNail implements ScreenNail,
@TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)
private static void releaseSurfaceTexture(SurfaceTexture st) {
+ st.setOnFrameAvailableListener(null);
if (ApiHelper.HAS_RELEASE_SURFACE_TEXTURE) {
st.release();
}