Skip to content

Disable SurfaceProducer.Callback when the surface is disposed manually. #7827

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

Merged
auto-submit merged 2 commits into from
Oct 8, 2024
Merged

Disable SurfaceProducer.Callback when the surface is disposed manually. #7827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f89dee
++
matanlurey Oct 8, 2024
a20c747
++
matanlurey Oct 8, 2024
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: 7 additions & 0 deletions packages/video_player/video_player_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.7.11

* Fixes a [bug](https://github.com/flutter/flutter/issues/156158) where a
harmless but annoying warning in the form of a native stack trace would be
printed when a previously disposed video player received a trim memory event
(i.e. by backgrounding).

## 2.7.10

* Fixes a [bug](https://github.com/flutter/flutter/issues/156158) where
Expand Down
4 changes: 4 additions & 0 deletions ...ideo_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,9 @@ long getPosition() {
void dispose() {
exoPlayer.release();
surfaceProducer.release();

// TODO(matanlurey): Remove when embedder no longer calls-back once released.
// https://github.com/flutter/flutter/issues/156434.
surfaceProducer.setCallback(null);
}
}
10 changes: 10 additions & 0 deletions ..._player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,16 @@ public void onSurfaceProducerDestroyedAndRecreatedReleasesAndThenRecreatesAndRes
videoPlayer.dispose();
}

@Test
public void onDisposeSurfaceProducerCallbackIsDisconnected() {
// Regression test for https://github.com/flutter/flutter/issues/156158.
VideoPlayer videoPlayer = createVideoPlayer();
verify(mockProducer).setCallback(any());

videoPlayer.dispose();
verify(mockProducer).setCallback(null);
}

@Test
public void onInitializedCalledWhenVideoPlayerInitiallyCreated() {
VideoPlayer videoPlayer = createVideoPlayer();
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: video_player_android
description: Android implementation of the video_player plugin.
repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
version: 2.7.10
version: 2.7.11

environment:
sdk: ^3.5.0
Expand Down