Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c42edf3 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove obsolete NativeWindow_fromSurfaceTexture"

parents 6a24bb3e 809820e2

native/android/native_window.cpp

+0 −8
Original line number Diff line number Diff line
@@ -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);

}

native/include/android/native_window_jni.h

+0 −8
Original line number Diff line number Diff line
@@ -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