Skip to content
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

Jump to bottom

Release TextureView surface within FlutterTextureView when disconnected. (#48535) #15899

Merged
merged 2 commits into from
Jan 23, 2020
Merged

Release TextureView surface within FlutterTextureView when disconnected. (#48535) #15899

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5366f85
Release TextureView surface within FlutterTextureView when disconnect…
matthew-carroll Jan 22, 2020
60917d7
Null out renderSurface.
matthew-carroll Jan 22, 2020
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
7 changes: 6 additions & 1 deletion shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
private boolean isAttachedToFlutterRenderer = false;
@Nullable
private FlutterRenderer flutterRenderer;
@Nullable
private Surface renderSurface;

// Connects the {@code SurfaceTexture} beneath this {@code TextureView} with Flutter's native code.
// Callbacks are received by this Object and then those messages are forwarded to our
Expand Down Expand Up @@ -172,7 +174,8 @@ private void connectSurfaceToRenderer() {
throw new IllegalStateException("connectSurfaceToRenderer() should only be called when flutterRenderer and getSurfaceTexture() are non-null.");
}

flutterRenderer.startRenderingToSurface(new Surface(getSurfaceTexture()));
renderSurface = new Surface(getSurfaceTexture());
flutterRenderer.startRenderingToSurface(renderSurface);
}

// FlutterRenderer must be non-null.
Expand All @@ -192,5 +195,7 @@ private void disconnectSurfaceFromRenderer() {
}

flutterRenderer.stopRenderingToSurface();
renderSurface.release();
renderSurface = null;
}
}