Skip to content

fix(🤖): release the Java Surface wrapper on the non-opaque path #4046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kushal-matiks wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(🤖): release the Java Surface wrapper on the non-opaque path #4046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21eea0d
fix(🤖): release the Java Surface wrapper on the non-opaque path
kushal-matiks Sep 3, 2026
638a406
Merge branch 'main' into fix/android-surface-leak
wcandillon Sep 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/skia/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,20 @@ void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
_updateTexImageMethod =
env->GetMethodID(surfaceTextureClass, "updateTexImage", "()V");

// ANativeWindow_fromSurface acquires its own reference on the underlying
// buffer producer, so the Java Surface wrapper can be released here.
// Without this, every Canvas leaks one android.view.Surface until
// finalization and CloseGuard reports "A resource failed to call
// Surface.release."
jmethodID surfaceRelease =
env->GetMethodID(surfaceClass, "release", "()V");
if (surfaceRelease != nullptr) {
env->CallVoidMethod(jSurface, surfaceRelease);
if (env->ExceptionCheck()) {
env->ExceptionClear();
}
}

// Acquire the native window from the Surface
// Clean up local references
env->DeleteLocalRef(jSurface);
Expand Down
Loading