From 809820e28bdeb13a7625e0ce80e0dc2e2d76929f Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 21 Oct 2011 12:52:29 -0700 Subject: [PATCH] Remove obsolete NativeWindow_fromSurfaceTexture Change-Id: I9351103929da515cb411fb2e7906bb9f27c4da20 --- native/android/native_window.cpp | 8 -------- native/include/android/native_window_jni.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/native/android/native_window.cpp b/native/android/native_window.cpp index d266fc681e3db..6b37a127182f2 100644 --- a/native/android/native_window.cpp +++ b/native/android/native_window.cpp @@ -32,14 +32,6 @@ ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface) { return win.get(); } -ANativeWindow* ANativeWindow_fromSurfaceTexture(JNIEnv* env, jobject surfaceTexture) { - sp win = android_SurfaceTexture_getNativeWindow(env, surfaceTexture); - if (win != NULL) { - win->incStrong((void*)ANativeWindow_acquire); - } - return win.get(); -} - void ANativeWindow_acquire(ANativeWindow* window) { window->incStrong((void*)ANativeWindow_acquire); } diff --git a/native/include/android/native_window_jni.h b/native/include/android/native_window_jni.h index 408c263b96e41..b9e72efb7681f 100644 --- a/native/include/android/native_window_jni.h +++ b/native/include/android/native_window_jni.h @@ -33,14 +33,6 @@ extern "C" { */ ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface); -/** - * Return the ANativeWindow associated with a Java SurfaceTexture object, - * for interacting with it through native code. This acquires a reference - * on the ANativeWindow that is returned; be sure to use ANativeWindow_release() - * when done with it so that it doesn't leak. - */ -ANativeWindow* ANativeWindow_fromSurfaceTexture(JNIEnv* env, jobject surfaceTexture); - #ifdef __cplusplus }; #endif