summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/MosaicPreviewRenderer.java
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-09-18 14:28:51 -0700
committerSascha Haeberling <haeberling@google.com>2013-09-18 14:32:55 -0700
commit638e6f06c877d90b907f66ea9c22b3c6b73c7384 (patch)
tree6d2123a6d02228f867ccc6f7e51e2a658b2092d5 /src/com/android/camera/MosaicPreviewRenderer.java
parent4ed20592482d2ab2f3f48ee72d5b1c06bf009034 (diff)
downloadandroid_packages_apps_Snap-638e6f06c877d90b907f66ea9c22b3c6b73c7384.tar.gz
android_packages_apps_Snap-638e6f06c877d90b907f66ea9c22b3c6b73c7384.tar.bz2
android_packages_apps_Snap-638e6f06c877d90b907f66ea9c22b3c6b73c7384.zip
Clean up ApiHelper and remove unused code paths.
Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
Diffstat (limited to 'src/com/android/camera/MosaicPreviewRenderer.java')
-rw-r--r--src/com/android/camera/MosaicPreviewRenderer.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/camera/MosaicPreviewRenderer.java b/src/com/android/camera/MosaicPreviewRenderer.java
index e8c02db24..42da4d9e7 100644
--- a/src/com/android/camera/MosaicPreviewRenderer.java
+++ b/src/com/android/camera/MosaicPreviewRenderer.java
@@ -16,7 +16,6 @@
package com.android.camera;
-import android.annotation.TargetApi;
import android.graphics.SurfaceTexture;
import android.os.ConditionVariable;
import android.os.Handler;
@@ -24,11 +23,8 @@ import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
-import com.android.camera.util.ApiHelper;
-
import javax.microedition.khronos.opengles.GL10;
-@TargetApi(ApiHelper.VERSION_CODES.HONEYCOMB) // uses SurfaceTexture
public class MosaicPreviewRenderer {
@SuppressWarnings("unused")
@@ -117,11 +113,8 @@ public class MosaicPreviewRenderer {
mEglThread.quit();
}
- @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)
private void releaseSurfaceTexture(SurfaceTexture st) {
- if (ApiHelper.HAS_RELEASE_SURFACE_TEXTURE) {
- st.release();
- }
+ st.release();
}
// Should be called from other thread.