diff options
author | Glenn Kasten <gkasten@google.com> | 2011-10-21 12:52:29 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2011-10-21 12:52:29 -0700 |
commit | 809820e28bdeb13a7625e0ce80e0dc2e2d76929f (patch) | |
tree | 680c1e03b493dea02ccf2be0e3bb0e44ec09a281 /native | |
parent | 5c405feb786d6d5f93a77d0cb26cc1c86ca4f3a4 (diff) | |
download | frameworks_base-809820e28bdeb13a7625e0ce80e0dc2e2d76929f.zip frameworks_base-809820e28bdeb13a7625e0ce80e0dc2e2d76929f.tar.gz frameworks_base-809820e28bdeb13a7625e0ce80e0dc2e2d76929f.tar.bz2 |
Remove obsolete NativeWindow_fromSurfaceTexture
Change-Id: I9351103929da515cb411fb2e7906bb9f27c4da20
Diffstat (limited to 'native')
-rw-r--r-- | native/android/native_window.cpp | 8 | ||||
-rw-r--r-- | native/include/android/native_window_jni.h | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/native/android/native_window.cpp b/native/android/native_window.cpp index d266fc6..6b37a12 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<ANativeWindow> 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 408c263..b9e72ef 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 |