diff options
author | Chih-Chung Chang <chihchung@google.com> | 2012-07-13 14:57:26 +0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-13 01:01:50 -0700 |
commit | 109bbb6199f48aa677f425dc0d5fb2ae3e8765fc (patch) | |
tree | 16bf3e75b4dedec60591bce6a9123665b819f210 /src/com/android/gallery3d/ui | |
parent | 6911cdad988bc9abdf32a34a5b3c60374dd4a9e4 (diff) | |
download | android_packages_apps_Snap-109bbb6199f48aa677f425dc0d5fb2ae3e8765fc.tar.gz android_packages_apps_Snap-109bbb6199f48aa677f425dc0d5fb2ae3e8765fc.tar.bz2 android_packages_apps_Snap-109bbb6199f48aa677f425dc0d5fb2ae3e8765fc.zip |
Only use SurfaceTexture.release and setIconAttribute on newer platforms.
Bug: 6706784
Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rw-r--r-- | src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java b/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java index a04313b8b..dd9b7ce1f 100644 --- a/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java +++ b/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java @@ -57,6 +57,13 @@ public abstract class SurfaceTextureScreenNail implements ScreenNail, } } + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) + private static void releaseSurfaceTexture(SurfaceTexture st) { + if (ApiHelper.HAS_RELEASE_SURFACE_TEXTURE) { + st.release(); + } + } + public SurfaceTexture getSurfaceTexture() { return mSurfaceTexture; } @@ -67,7 +74,7 @@ public abstract class SurfaceTextureScreenNail implements ScreenNail, } mExtTexture.recycle(); mExtTexture = null; - mSurfaceTexture.release(); + releaseSurfaceTexture(mSurfaceTexture); mSurfaceTexture = null; } |