Skip to content

Commit b6b7bfa

Browse files
Manual roll Flutter from fa402c8057a1 to ead6b0d17c89 (14 revisions) (#7806)
Manual roll requested by [email protected] flutter/flutter@fa402c8...ead6b0d 2024-09-27 [email protected] Remove left-over traces of "link-dry-run" - which isn't used anywhere in flutter (flutter/flutter#155820) 2024-09-27 [email protected] Roll Flutter Engine from e57b440ec4ee to 7c603de2dca7 (5 revisions) (flutter/flutter#155811) 2024-09-27 [email protected] Fix DropdownMenu rendered behind AppBar (flutter/flutter#155539) 2024-09-27 [email protected] Roll Flutter Engine from 53517772a5b0 to e57b440ec4ee (8 revisions) (flutter/flutter#155799) 2024-09-27 [email protected] Throw StateError when implicitView is null on `wrapWithDefaultView`. (flutter/flutter#155734) 2024-09-27 [email protected] Roll packages manually (flutter/flutter#155786) 2024-09-27 [email protected] fix: SelectableText should handle focus changes (flutter/flutter#155771) 2024-09-27 [email protected] Use flutter from in same repo (not path) in `generate_gradle_lockfiles.dart` (again) (flutter/flutter#155794) 2024-09-26 [email protected] Use flutter from in same repo (not path) in `generate_gradle_lockfiles.dart` (flutter/flutter#155790) 2024-09-26 [email protected] `RenderParagraph` should invalidate its `_SelectableFragment`s cached rects on window size updates (flutter/flutter#155719) 2024-09-26 [email protected] Fix broken text field with set hint and min and max lines(#153183) (flutter/flutter#153235) 2024-09-26 [email protected] Roll Flutter Engine from 9e6133e8d906 to 53517772a5b0 (1 revision) (flutter/flutter#155772) 2024-09-26 [email protected] Fix line-wrapping in `flutter create` error message. (flutter/flutter#150325) 2024-09-26 [email protected] remove fujino from CODEOWNERS (flutter/flutter#155369) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent bb00d34 commit b6b7bfa

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fa402c8057a11481b834c478cb8374df9bbc0819
1+
ead6b0d17c893109b9424aaf116a74295472cc73

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ public void onSurfaceRequested(@NonNull SurfaceRequest request) {
8383
surfaceProducer.setCallback(
8484
new TextureRegistry.SurfaceProducer.Callback() {
8585
@Override
86+
// TODO(matanlurey): Replace with onSurfaceAvailable once available on stable;
87+
// https://github.com/flutter/flutter/issues/155131.
88+
@SuppressWarnings({"deprecation", "removal"})
8689
public void onSurfaceCreated() {
8790
// Do nothing. The Preview.SurfaceProvider will handle this whenever a new
8891
// Surface is needed.

packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void createSurfaceProducer_setsExpectedSurfaceProducerCallback() {
134134
reset(mockSurfaceRequest);
135135

136136
// Verify callback's onSurfaceCreated does not interact with the SurfaceRequest.
137-
callback.onSurfaceCreated();
137+
simulateSurfaceCreation(callback);
138138
verifyNoMoreInteractions(mockSurfaceRequest);
139139
}
140140

@@ -262,4 +262,12 @@ public void setTargetRotation_makesCallToSetTargetRotation() {
262262

263263
verify(mockPreview).setTargetRotation(targetRotation);
264264
}
265+
266+
// TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once
267+
// available on stable; see https://github.com/flutter/flutter/issues/155131.
268+
// This seperate method only exists to scope the suppression.
269+
@SuppressWarnings({"deprecation", "removal"})
270+
void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
271+
producerLifecycle.onSurfaceCreated();
272+
}
265273
}

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void onSurfaceProducerDestroyedAndRecreatedReleasesAndThenRecreatesAndRes
189189

190190
// Create a new mock exo player so that we get a new instance.
191191
mockExoPlayer = mock(ExoPlayer.class);
192-
producerLifecycle.onSurfaceCreated();
192+
simulateSurfaceCreation(producerLifecycle);
193193

194194
verify(mockExoPlayer).seekTo(10L);
195195
verify(mockExoPlayer).setRepeatMode(Player.REPEAT_MODE_ALL);
@@ -231,7 +231,7 @@ public void onSurfaceCreatedDoesNotSendInitializeEventAgain() {
231231

232232
// Trigger destroyed/created.
233233
producerLifecycle.onSurfaceDestroyed();
234-
producerLifecycle.onSurfaceCreated();
234+
simulateSurfaceCreation(producerLifecycle);
235235

236236
// Initial listener, and the new one from the resume.
237237
verify(mockExoPlayer, times(2)).addListener(listenerCaptor.capture());
@@ -257,7 +257,7 @@ public void onSurfaceCreatedWithoutDestroyDoesNotRecreate() {
257257
TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
258258

259259
// Calling onSurfaceCreated does not do anything, since the surface was never destroyed.
260-
producerLifecycle.onSurfaceCreated();
260+
simulateSurfaceCreation(producerLifecycle);
261261
verifyNoMoreInteractions(mockProducer);
262262

263263
videoPlayer.dispose();
@@ -271,4 +271,12 @@ public void disposeReleasesTextureAndPlayer() {
271271
verify(mockProducer).release();
272272
verify(mockExoPlayer).release();
273273
}
274+
275+
// TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once
276+
// available on stable; see https://github.com/flutter/flutter/issues/155131.
277+
// This seperate method only exists to scope the suppression.
278+
@SuppressWarnings({"deprecation", "removal"})
279+
void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
280+
producerLifecycle.onSurfaceCreated();
281+
}
274282
}

0 commit comments

Comments
 (0)