From 39fe9d2c03ecf1b98f7e1e1229931fd46e49285b Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:51 +0000 Subject: [PATCH 01/17] a0e75cd30 remove fujino from CODEOWNERS (flutter/flutter#155369) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 594a2c4458a5..b218815f0f32 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -fa402c8057a11481b834c478cb8374df9bbc0819 +a0e75cd3094c75c3958aa38c8b248bf5b48ae7fb From 1b6b19de73d86e4b95f6359263b1b788cd15ee06 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:51 +0000 Subject: [PATCH 02/17] 20bc0a9cb Fix line-wrapping in `flutter create` error message. (flutter/flutter#150325) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index b218815f0f32..c0fe8c5c99c0 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -a0e75cd3094c75c3958aa38c8b248bf5b48ae7fb +20bc0a9cb8df861c2032bca5efd704b2b0b0f74e From 3f1a0e7633bcf5e98783d36f17a2b75ff03a1205 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:51 +0000 Subject: [PATCH 03/17] feb9c5928 Roll Flutter Engine from 9e6133e8d906 to 53517772a5b0 (1 revision) (flutter/flutter#155772) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index c0fe8c5c99c0..b67b346fbb59 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -20bc0a9cb8df861c2032bca5efd704b2b0b0f74e +feb9c592840a9dc7aacfbd8112485f6f9c4b4d72 From 0da66742cb6c31571c92052fcdcc6a7cdbbcba20 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:51 +0000 Subject: [PATCH 04/17] 7f663fc1d Fix broken text field with set hint and min and max lines(#153183) (flutter/flutter#153235) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index b67b346fbb59..b813ce86a286 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -feb9c592840a9dc7aacfbd8112485f6f9c4b4d72 +7f663fc1d8a797f0a1f1bfccb547448fd1fb0b09 From 9862a253e6d0094e083fe8eb9be8c157c391b994 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:51 +0000 Subject: [PATCH 05/17] 9a64920bb `RenderParagraph` should invalidate its `_SelectableFragment`s cached rects on window size updates (flutter/flutter#155719) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index b813ce86a286..49d615ee1bb1 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -7f663fc1d8a797f0a1f1bfccb547448fd1fb0b09 +9a64920bb96dcaac3e84afd987e8a789dedc9a7f From a5292975958456e860599dc51d557905683c0f1e Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:51 +0000 Subject: [PATCH 06/17] 2c0a4f2d4 Use flutter from in same repo (not path) in `generate_gradle_lockfiles.dart` (flutter/flutter#155790) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 49d615ee1bb1..1fbd98a7548f 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -9a64920bb96dcaac3e84afd987e8a789dedc9a7f +2c0a4f2d44a5d624f977e3cb86af64516ad96e57 From 9ce3d529248ed6b96f5399fb1a60532bd2a4223f Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 07/17] 5b32f3327 Use flutter from in same repo (not path) in `generate_gradle_lockfiles.dart` (again) (flutter/flutter#155794) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 1fbd98a7548f..98eb17fe914b 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -2c0a4f2d44a5d624f977e3cb86af64516ad96e57 +5b32f33271058e4eb9daaddaa8f4383aa86dc0a2 From 4048ac30e841632d84fac6704941f0016ad2d733 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 08/17] 799cf16ae fix: SelectableText should handle focus changes (flutter/flutter#155771) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 98eb17fe914b..18a95d6236e3 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -5b32f33271058e4eb9daaddaa8f4383aa86dc0a2 +799cf16aeb902b12113c81692f7cd45c9d4306e7 From ebae2cf0950827214ce92819a5ba53b697feea8f Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 09/17] cad7418f0 Roll packages manually (flutter/flutter#155786) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 18a95d6236e3..7dadace6d845 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -799cf16aeb902b12113c81692f7cd45c9d4306e7 +cad7418f0a31c4f101a753ac8f31978488bdd9a3 From d570fa14829817d844e12f529a913fcfaa7d2cad Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 10/17] f9a76aea8 Throw StateError when implicitView is null on `wrapWithDefaultView`. (flutter/flutter#155734) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 7dadace6d845..d4ba86d17d76 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -cad7418f0a31c4f101a753ac8f31978488bdd9a3 +f9a76aea871230e2962856d740385f6f9a297862 From 5478d5e457b350fa79f585c014518b0fd4f61406 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 11/17] 7bb935291 Roll Flutter Engine from 53517772a5b0 to e57b440ec4ee (8 revisions) (flutter/flutter#155799) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index d4ba86d17d76..5d790d153749 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -f9a76aea871230e2962856d740385f6f9a297862 +7bb9352911d0471568a77fc57b94a646fe9571af From f13be83f652d329b796eb28f976ff180abec246e Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 12/17] 9ee3fb813 Fix DropdownMenu rendered behind AppBar (flutter/flutter#155539) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 5d790d153749..abf29e68966c 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -7bb9352911d0471568a77fc57b94a646fe9571af +9ee3fb813fc1e949c5ea2331ce4b25e50a57d0f0 From b0767dfa5973b5b270b5f2616f9b2cdb8cfbe8a7 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 13/17] 9be22b58c Roll Flutter Engine from e57b440ec4ee to 7c603de2dca7 (5 revisions) (flutter/flutter#155811) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index abf29e68966c..fa1821ed5ab4 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -9ee3fb813fc1e949c5ea2331ce4b25e50a57d0f0 +9be22b58c4bfe8b6cb447de13a500db4e1bd8c33 From dae71266eec0b6fddbc8b762883dd9ee758e603e Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 7 Oct 2024 14:46:52 +0000 Subject: [PATCH 14/17] ead6b0d17 Remove left-over traces of "link-dry-run" - which isn't used anywhere in flutter (flutter/flutter#155820) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index fa1821ed5ab4..df575840c1e3 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -9be22b58c4bfe8b6cb447de13a500db4e1bd8c33 +ead6b0d17c893109b9424aaf116a74295472cc73 From 54335e8f713c28482fa3251eebb5e216b64147f2 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 7 Oct 2024 10:59:45 -0400 Subject: [PATCH 15/17] Suppress warning, as with video_player_android --- .../java/io/flutter/plugins/camerax/PreviewHostApiImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java index 81d47936bcaf..e9b7b0d89ac6 100644 --- a/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java +++ b/packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewHostApiImpl.java @@ -83,6 +83,9 @@ public void onSurfaceRequested(@NonNull SurfaceRequest request) { surfaceProducer.setCallback( new TextureRegistry.SurfaceProducer.Callback() { @Override + // TODO(matanlurey): Replace with onSurfaceAvailable once available on stable; + // https://github.com/flutter/flutter/issues/155131. + @SuppressWarnings({"deprecation", "removal"}) public void onSurfaceCreated() { // Do nothing. The Preview.SurfaceProvider will handle this whenever a new // Surface is needed. From a975fcbf8d822691b001827f1a086b4545e8d2d9 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 7 Oct 2024 11:39:00 -0400 Subject: [PATCH 16/17] Suppress warning in tests as well --- .../plugins/videoplayer/VideoPlayerTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java b/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java index c968848cbbe3..b5dde43b9e0c 100644 --- a/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java +++ b/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java @@ -189,7 +189,7 @@ public void onSurfaceProducerDestroyedAndRecreatedReleasesAndThenRecreatesAndRes // Create a new mock exo player so that we get a new instance. mockExoPlayer = mock(ExoPlayer.class); - producerLifecycle.onSurfaceCreated(); + simulateSurfaceCreation(producerLifecycle); verify(mockExoPlayer).seekTo(10L); verify(mockExoPlayer).setRepeatMode(Player.REPEAT_MODE_ALL); @@ -231,7 +231,7 @@ public void onSurfaceCreatedDoesNotSendInitializeEventAgain() { // Trigger destroyed/created. producerLifecycle.onSurfaceDestroyed(); - producerLifecycle.onSurfaceCreated(); + simulateSurfaceCreation(producerLifecycle); // Initial listener, and the new one from the resume. verify(mockExoPlayer, times(2)).addListener(listenerCaptor.capture()); @@ -257,7 +257,7 @@ public void onSurfaceCreatedWithoutDestroyDoesNotRecreate() { TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue(); // Calling onSurfaceCreated does not do anything, since the surface was never destroyed. - producerLifecycle.onSurfaceCreated(); + simulateSurfaceCreation(producerLifecycle); verifyNoMoreInteractions(mockProducer); videoPlayer.dispose(); @@ -271,4 +271,12 @@ public void disposeReleasesTextureAndPlayer() { verify(mockProducer).release(); verify(mockExoPlayer).release(); } + + // TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once + // available on stable; see https://github.com/flutter/flutter/issues/155131. + // This seperate method only exists to scope the suppression. + @SuppressWarnings({"deprecation", "removal"}) + void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) { + producerLifecycle.onSurfaceCreated(); + } } From bd61b8811506fa4b2ff05c036826d1452b81766f Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 7 Oct 2024 12:24:07 -0400 Subject: [PATCH 17/17] And in camera tests --- .../java/io/flutter/plugins/camerax/PreviewTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java b/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java index 0b475b7a1dc6..83ccb1edd9c5 100644 --- a/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java +++ b/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java @@ -134,7 +134,7 @@ public void createSurfaceProducer_setsExpectedSurfaceProducerCallback() { reset(mockSurfaceRequest); // Verify callback's onSurfaceCreated does not interact with the SurfaceRequest. - callback.onSurfaceCreated(); + simulateSurfaceCreation(callback); verifyNoMoreInteractions(mockSurfaceRequest); } @@ -262,4 +262,12 @@ public void setTargetRotation_makesCallToSetTargetRotation() { verify(mockPreview).setTargetRotation(targetRotation); } + + // TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once + // available on stable; see https://github.com/flutter/flutter/issues/155131. + // This seperate method only exists to scope the suppression. + @SuppressWarnings({"deprecation", "removal"}) + void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) { + producerLifecycle.onSurfaceCreated(); + } }