Merge branch 'master' into foundation

Author: mattkae

.ci.yaml

@@ -121,6 +121,17 @@ platform_properties:
       os: Linux
       device_type: "mokey"
 
+  linux_galaxy_s24:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:35v1"},
+          {"dependency": "open_jdk", "version": "version:17"},
+          {"dependency": "curl", "version": "version:7.64.0"}
+        ]
+      os: Linux
+      device_type: "SM-S921U1"
+
   mac:
     properties:
       contexts: >-
@@ -3065,6 +3076,17 @@ targets:
         ["devicelab", "android", "linux", "pixel", "7pro"]
       task_name: new_gallery_impeller__transition_perf
 
+  # Samsung Galaxy S24, Impeller (Vulkan)
+  - name: Linux_galaxy_s24 new_gallery_impeller__transition_perf
+    recipe: devicelab/devicelab_drone
+    bringup: true
+    presubmit: false
+    timeout: 60
+    properties:
+      tags: >
+        ["devicelab", "android", "linux", "samsung", "s24"]
+      task_name: new_gallery_impeller__transition_perf
+
   # Pixel 7 Pro, Impeller (OpenGL)
   - name: Linux_pixel_7pro new_gallery_opengles_impeller__transition_perf
     recipe: devicelab/devicelab_drone

.github/ISSUE_TEMPLATE/g3_bug.yml

@@ -0,0 +1,136 @@
+name: Report a bug
+description: |
+  You found a bug in Flutter causing your application to crash or
+  throw an exception, a widget is buggy, or something looks wrong.
+labels: 'customer: google'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for using Flutter!
+
+        If you are looking for support, please check out our documentation
+        or consider asking a question on Stack Overflow:
+
+          - https://flutter.dev/
+          - https://api.flutter.dev/
+          - https://stackoverflow.com/questions/tagged/flutter?sort=frequent
+  - type: markdown
+    attributes:
+      value: |
+        Before filling the form fields, please consider the following:
+        - Ensure that you have searched the [existing issues](https://github.com/flutter/flutter/issues)
+        - Read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
+  - type: markdown
+    attributes:
+      value: |
+        Flutter GitHub issues are public and so you must avoid posting any Google confidential information in them.
+  - type: checkboxes
+    id: priority-indicator
+    attributes:
+    label: Help us understand the severity of this issue
+    description: Please only choose one
+    options:
+      - label: causing severe production issues e.g. malfunctions or data loss
+      - label: blocking next binary release
+      - label: blocking a client feature launch within a quarter
+      - label: nice-to-have but does not block a launch within the next quarter
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Please tell us exactly how to reproduce the problem you are running into.
+      placeholder: |
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected results
+      description: Please tell us what is expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual results
+      description: Please tell us what is actually happening.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Code sample
+      description: |
+        Please create a minimal reproducible sample that shows the problem
+        and attach it below between the lines with the backticks.
+
+        To create it, use the `flutter create bug` command and update the `main.dart` file.
+
+        Alternatively, you can use https://dartpad.dev/ or create a public GitHub
+        repository to share your sample.
+
+        Without this we will unlikely be able to progress on the issue, and because of that
+        we regretfully will have to close it.
+
+        Note: Please do not upload screenshots of text. Instead, use code blocks
+        or the above mentioned ways to upload your code sample.
+      value: |
+        <details open><summary>Code sample</summary>
+
+        ```dart
+        [Paste your code here]
+        ```
+
+        </details>
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots or Video
+      description: |
+        Upload any screenshots or video of the bug if applicable.
+      value: |
+        <details open>
+        <summary>Screenshots / Video demonstration</summary>
+
+        [Upload media here]
+
+        </details>
+  - type: textarea
+    attributes:
+      label: Logs
+      description: |
+        Include the full logs of the commands you are running between the lines
+        with the backticks below. If you are running any `flutter` commands,
+        please include the output of running them with `--verbose`; for example,
+        the output of running `flutter --verbose create foo`.
+
+        If the logs are too large to be uploaded to GitHub, you may upload
+        them as a `txt` file or use online tools like https://pastebin.com to
+        share it.
+
+        Note: Please do not upload screenshots of text. Instead, use code blocks
+        or the above mentioned ways to upload logs.
+      value: |
+        <details open><summary>Logs</summary>
+
+        ```console
+        [Paste your logs here]
+        ```
+
+        </details>
+  - type: textarea
+    attributes:
+      label: Flutter Doctor output
+      description: |
+        Please provide the full output of running `flutter doctor -v`
+      value: |
+        <details open><summary>Doctor output</summary>
+
+        ```console
+        [Paste your output here]
+        ```
+
+        </details>
+    validations:
+      required: true

DEPS

@@ -56,23 +56,23 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '023ac80cef146b2ccd96ec813c177432fe1a6fd6',
+  'dart_revision': '2cecb16348e4778844660d5e7d16a96efe3706ec',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_binaryen_rev': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
-  'dart_boringssl_rev': '0147d7f28324c5b2923cd1e412e8aaf74124622c',
-  'dart_core_rev': 'a896913715f2d8fb86d099b75dbfd02bf0d658a4',
+  'dart_boringssl_rev': '8c6b0c04f19f5a6a13af3e29a6a4bb6784cb2bd7',
+  'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
   'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
-  'dart_http_rev': 'b7cdf6136926589210662bbdd71000e7abab7271',
+  'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': 'd00f905450c562493d918884e02048b7aacc00a3',
+  'dart_protobuf_rev': '610943a3bed70c1c2079af5fca02462df10d223f',
   'dart_pub_rev': '710265bae23ad5860f33287fba10b5c369f19a93',
-  'dart_tools_rev': '30de295e959beaaae7a18d2249a1cddb9053dd02',
+  'dart_tools_rev': 'b51f39d01f5a4af33428a0189cd62595c01e23de',
   'dart_web_rev': 'c2d5f63e9ea4c1409d6e159fc7b92dbcf4dc0d4d',
-  'dart_webdev_rev': '616da45582e008efa114728927eabb498c71f1b7',
+  'dart_webdev_rev': '718c39c3b10f6e77f767d70d1f30f8a6c8262d6f',
   'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -313,7 +313,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@e1295863b11c54680bf178ec9c2662a33b0e24be',
+   Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/glob':
    Var('dart_git') + '/glob.git@043796be996190473b397fa2fecfa34bb91376fb',
@@ -340,7 +340,7 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@2a7442f7d6d3e63fdc7b387128619b263dcb7e78',
+   Var('dart_git') + '/shelf.git@b39e61196ce555dc1d3a0c3da695228fa6bdebb8',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
@@ -364,7 +364,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:f863f0b43625eb04539a34d7cc25029ba80dd522'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:a8bfb132c5f7b9555d13ea79eaf0eaa77825824d'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 

TESTOWNERS

@@ -167,38 +167,38 @@
 ## Mac iOS DeviceLab tests
 /dev/devicelab/bin/tasks/animated_complex_opacity_perf_ios__e2e_summary.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/animation_with_microtasks_perf_ios__timeline_summary.dart @jtmcdole @flutter/engine
-/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
-/dev/devicelab/bin/tasks/basic_material_app_ios__compile.dart @jmagman @flutter/tool
-/dev/devicelab/bin/tasks/channels_integration_test_ios.dart @jmagman @flutter/engine
+/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart @louisehsu @flutter/engine
+/dev/devicelab/bin/tasks/basic_material_app_ios__compile.dart @vashworth @flutter/tool
+/dev/devicelab/bin/tasks/channels_integration_test_ios.dart @loic-sharma @flutter/engine
 /dev/devicelab/bin/tasks/codegen_integration_mac.dart @bkonyi @flutter/tool
-/dev/devicelab/bin/tasks/color_filter_and_fade_perf_ios__e2e_summary.dart @hellohuanlin @flutter/engine
-/dev/devicelab/bin/tasks/complex_layout_ios__start_up.dart @louisehsu @flutter/engine
+/dev/devicelab/bin/tasks/color_filter_and_fade_perf_ios__e2e_summary.dart @louisehsu @flutter/engine
+/dev/devicelab/bin/tasks/complex_layout_ios__start_up.dart @vashworth @flutter/engine
 /dev/devicelab/bin/tasks/complex_layout_scroll_perf_bad_ios__timeline_summary.dart @jonahwilliams @flutter/engine
-/dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
+/dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart @louisehsu @flutter/engine
 /dev/devicelab/bin/tasks/cubic_bezier_perf_ios_sksl_warmup__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/external_textures_integration_test_ios.dart @jtmcdole @flutter/engine
-/dev/devicelab/bin/tasks/flavors_test_ios.dart @jmagman @flutter/tool
+/dev/devicelab/bin/tasks/flavors_test_ios.dart @vashworth @flutter/tool
 /dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios.dart @jtmcdole @flutter/engine
-/dev/devicelab/bin/tasks/flutter_gallery_ios__compile.dart @jmagman @flutter/engine
-/dev/devicelab/bin/tasks/flutter_gallery_ios__start_up.dart @louisehsu @flutter/engine
+/dev/devicelab/bin/tasks/flutter_gallery_ios__compile.dart @vashworth @flutter/engine
+/dev/devicelab/bin/tasks/flutter_gallery_ios__start_up.dart @vashworth @flutter/engine
 /dev/devicelab/bin/tasks/flutter_gallery_ios_sksl_warmup__transition_perf.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/fullscreen_textfield_perf_ios__e2e_summary.dart @louisehsu @flutter/engine
-/dev/devicelab/bin/tasks/hello_world_ios__compile.dart @jmagman @flutter/engine
+/dev/devicelab/bin/tasks/hello_world_ios__compile.dart @vashworth @flutter/engine
 /dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios__benchmark.dart @louisehsu @flutter/tool
 /dev/devicelab/bin/tasks/imitation_game_flutter__compile.dart @louisehsu @flutter/tool
 /dev/devicelab/bin/tasks/imitation_game_swiftui__compile.dart @louisehsu @flutter/tool
 # TODO(vashworth): Remove once https://github.com/flutter/flutter/issues/142305 is fixed.
 /dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios__benchmark_no_dds.dart @louisehsu @flutter/tool
-/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
-/dev/devicelab/bin/tasks/integration_test_test_ios.dart @jmagman @flutter/engine
-/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart @louisehsu @flutter/tool
+/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf_ios__timeline_summary.dart @louisehsu @flutter/engine
+/dev/devicelab/bin/tasks/integration_test_test_ios.dart @loic-sharma @flutter/engine
+/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart @loic-sharma @flutter/tool
 /dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart @jtmcdole @flutter/engine
-/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart @louisehsu @flutter/engine
-/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart @louisehsu @flutter/tool
-/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart @louisehsu @flutter/tool
-/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @jmagman @flutter/tool
-/dev/devicelab/bin/tasks/ios_defines_test.dart @jmagman @flutter/tool
+/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart @loic-sharma @flutter/engine
+/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart @loic-sharma @flutter/tool
+/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart @loic-sharma @flutter/tool
+/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @vashworth @flutter/tool
+/dev/devicelab/bin/tasks/ios_defines_test.dart @louisehsu @flutter/tool
 /dev/devicelab/bin/tasks/ios_picture_cache_complexity_scoring_perf__timeline_summary.dart @flar @flutter/engine
 /dev/devicelab/bin/tasks/ios_platform_view_tests.dart @stuartmorgan @flutter/plugin
 /dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart @jtmcdole @flutter/engine
@@ -218,7 +218,7 @@
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart @jonahwilliams @flutter/engine
 /dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
-/dev/devicelab/bin/tasks/route_test_ios.dart @jmagman @flutter/tool
+/dev/devicelab/bin/tasks/route_test_ios.dart @vashworth @flutter/tool
 /dev/devicelab/bin/tasks/simple_animation_perf_ios.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/very_long_picture_scrolling_perf_ios__e2e_summary.dart @flar @flutter/engine
@@ -235,7 +235,7 @@
 /dev/devicelab/bin/tasks/android_release_builds_exclude_dev_dependencies_test.dart @camsim99 @flutter/android
 /dev/devicelab/bin/tasks/basic_material_app_macos__compile.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/build_aar_module_test.dart @bkonyi @flutter/tool
-/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart @jmagman @flutter/tool
+/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart @vashworth @flutter/tool
 /dev/devicelab/bin/tasks/channels_integration_test_macos.dart @gaaclarke @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_macos__compile.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_macos__start_up.dart @cbracken @flutter/desktop
@@ -244,7 +244,7 @@
 /dev/devicelab/bin/tasks/complex_layout_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @stuartmorgan @flutter/plugin
 /dev/devicelab/bin/tasks/entrypoint_dart_registrant.dart @aaclarke @flutter/plugin
-/dev/devicelab/bin/tasks/flavors_test_macos.dart @cbracken @flutter/desktop
+/dev/devicelab/bin/tasks/flavors_test_macos.dart @vashworth @flutter/desktop
 /dev/devicelab/bin/tasks/flutter_gallery_macos__compile.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/flutter_gallery_macos__start_up.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/flutter_gallery_win_desktop__compile.dart @yaakovschectman @flutter/desktop
@@ -270,7 +270,7 @@
 /dev/devicelab/bin/tasks/module_host_with_custom_build_test.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart @gmackall @flutter/android
-/dev/devicelab/bin/tasks/module_test_ios.dart @jmagman @flutter/tool
+/dev/devicelab/bin/tasks/module_test_ios.dart @vashworth @flutter/tool
 /dev/devicelab/bin/tasks/native_assets_ios_simulator.dart @dcharkes @flutter/ios
 /dev/devicelab/bin/tasks/native_ui_tests_macos.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/platform_channel_sample_test_macos.dart @cbracken @flutter/desktop
@@ -281,7 +281,7 @@
 /dev/devicelab/bin/tasks/plugin_test.dart @stuartmorgan @flutter/plugin
 /dev/devicelab/bin/tasks/plugin_test_ios.dart @stuartmorgan @flutter/ios
 /dev/devicelab/bin/tasks/plugin_test_linux.dart @stuartmorgan @flutter/desktop
-/dev/devicelab/bin/tasks/plugin_test_macos.dart @cbracken @flutter/desktop
+/dev/devicelab/bin/tasks/plugin_test_macos.dart @vashworth @flutter/desktop
 /dev/devicelab/bin/tasks/plugin_test_windows.dart @loic-sharma @flutter/desktop
 /dev/devicelab/bin/tasks/run_debug_test_android.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/run_debug_test_android.dart @bkonyi @flutter/tool

bin/internal/flutter_packages.version

@@ -1 +1 @@
-cb4fb13e19756cbbcb523bc33fbf7b7a5923e787
+a9b91727371113fc453af6a1176a9aa4d0e990f9

bin/internal/update_engine_version.ps1

@@ -19,6 +19,12 @@ $ErrorActionPreference = "Stop"
 $progName = Split-Path -parent $MyInvocation.MyCommand.Definition
 $flutterRoot = (Get-Item $progName).parent.parent.FullName
 
+# On stable, beta, and release tags, the engine.version is tracked by git - do not override it.
+$trackedEngine = (git -C "$flutterRoot" ls-files bin/internal/engine.version) | Out-String
+if ($trackedEngine.length -ne 0) {
+  return
+}
+
 # Allow overriding the intended engine version via FLUTTER_PREBUILT_ENGINE_VERSION.
 #
 # This is for systems, such as Github Actions, where we know ahead of time the
@@ -35,8 +41,6 @@ if (![string]::IsNullOrEmpty($env:FLUTTER_PREBUILT_ENGINE_VERSION)) {
 
 # Test for fusion repository
 if ([string]::IsNullOrEmpty($engineVersion) -and (Test-Path "$flutterRoot\DEPS" -PathType Leaf) -and (Test-Path "$flutterRoot\engine\src\.gn" -PathType Leaf)) {
-    # Calculate the engine hash from tracked git files.
-    $branch = (git -C "$flutterRoot" rev-parse --abbrev-ref HEAD)
     if ($null -eq $Env:LUCI_CONTEXT) {
         $ErrorActionPreference = "Continue"
         git -C "$flutterRoot" remote get-url upstream *> $null
@@ -53,13 +57,11 @@ if ([string]::IsNullOrEmpty($engineVersion) -and (Test-Path "$flutterRoot\DEPS"
     }
 }
 
-if (($branch -ne "stable" -and $branch -ne "beta")) {
-    # Write the engine version out so downstream tools know what to look for.
-    $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
-    [System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.version", $engineVersion, $utf8NoBom)
+# Write the engine version out so downstream tools know what to look for.
+$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
+[System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.version", $engineVersion, $utf8NoBom)
 
-    # The realm on CI is passed in.
-    if ($Env:FLUTTER_REALM) {
-        [System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.realm", $Env:FLUTTER_REALM, $utf8NoBom)
-    }
+# The realm on CI is passed in.
+if ($Env:FLUTTER_REALM) {
+    [System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.realm", $Env:FLUTTER_REALM, $utf8NoBom)
 }