diff options
Diffstat (limited to 'native')
-rw-r--r-- | native/android/native_window.cpp | 8 | ||||
-rw-r--r-- | native/include/android/native_activity.h | 9 | ||||
-rw-r--r-- | native/include/android/native_window_jni.h | 8 |
3 files changed, 8 insertions, 17 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_activity.h b/native/include/android/native_activity.h index a361846..bc70f88 100644 --- a/native/include/android/native_activity.h +++ b/native/include/android/native_activity.h @@ -60,7 +60,14 @@ typedef struct ANativeActivity { JNIEnv* env; /** - * The NativeActivity Java class. + * The NativeActivity object handle. + * + * IMPORTANT NOTE: This member is mis-named. It should really be named + * 'activity' instead of 'clazz', since it's a reference to the + * NativeActivity instance created by the system for you. + * + * We unfortunately cannot change this without breaking NDK + * source-compatibility. */ jobject clazz; 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 |