Skip to content

Commit 3460a82

Browse files
authored
Merge branch 'master' into fix-local-matrix-image-filter-bounds
2 parents e0935c2 + b1a73f8 commit 3460a82

450 files changed

Lines changed: 18541 additions & 5680 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/run-devicelab-with-led/SKILL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Host assumptions:
1717

1818
# Running DeviceLab Tests with `led`
1919

20-
This skill guides running post-submit and DeviceLab tests for pull requests (PRs) using LUCI's `led` CLI tool. For additional context, see [docs/infra/Running-Devicelab-Tests-For-PR.md](../../../docs/infra/Running-Devicelab-Tests-For-PR.md).
20+
This skill guides running post-submit and DeviceLab tests for pull requests (PRs) using LUCI's `led` CLI tool. For additional context, see [docs/infra/Running-Devicelab-Tests-For-PR.md](../../../docs/infra/Running-Devicelab-Tests-For-PR.md). If no recipe or bot changes are needed, `bb add` may fit better; see [docs/infra/Using-bb-and-led.md](../../../docs/infra/Using-bb-and-led.md). Never run `led auth-login` yourself (interactive); if `led auth-info` reports `Not logged in.`, ask the user to run it.
2121

2222
## Prerequisites
2323

‎.ci.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,9 @@ platform_properties:
254254
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
255255
{"dependency": "apple_signing", "version": "version:to_2027"}
256256
]
257-
os: Mac-15.7
257+
os: Mac-26.6 # Keep os the same as "Mac_build_test" targets' drone_dimensions
258+
cpu: arm64
258259
device_type: none
259-
cpu: x86
260260
$flutter/osx_sdk : >-
261261
{
262262
"sdk_version": "17c52"
@@ -298,7 +298,7 @@ platform_properties:
298298
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
299299
{"dependency": "apple_signing", "version": "version:to_2027"}
300300
]
301-
os: Mac-15.7
301+
os: Mac-15.7|Mac-26.6
302302
device_os: iOS-18|iOS-26
303303
$flutter/osx_sdk : >-
304304
{
@@ -316,7 +316,7 @@ platform_properties:
316316
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
317317
{"dependency": "apple_signing", "version": "version:to_2027"}
318318
]
319-
os: Mac-15.7
319+
os: Mac-15.7|Mac-26.6
320320
cpu: x86
321321
device_os: iOS-18|iOS-26
322322
$flutter/osx_sdk : >-
@@ -335,7 +335,7 @@ platform_properties:
335335
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
336336
{"dependency": "apple_signing", "version": "none"}
337337
]
338-
os: Mac-15.7
338+
os: Mac-15.7|Mac-26.6
339339
cpu: arm64
340340
device_os: iOS-18|iOS-26
341341
$flutter/osx_sdk : >-
@@ -3213,7 +3213,6 @@ targets:
32133213
task_name: android_engine_flags_release_test
32143214

32153215
- name: Linux_android_emu android_intent_parsing_test
3216-
bringup: true
32173216
recipe: devicelab/devicelab_drone
32183217
timeout: 60
32193218
properties:
@@ -4272,7 +4271,7 @@ targets:
42724271
recipe: flutter/flutter_drone
42734272
timeout: 60
42744273
properties:
4275-
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193155
4274+
os: Mac-26.6
42764275
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
42774276
dependencies: >-
42784277
[
@@ -4301,7 +4300,7 @@ targets:
43014300
recipe: flutter/flutter_drone
43024301
timeout: 60
43034302
properties:
4304-
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193157
4303+
os: Mac-26.6
43054304
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
43064305
dependencies: >-
43074306
[
@@ -4397,7 +4396,7 @@ targets:
43974396
recipe: flutter/flutter_drone
43984397
timeout: 60
43994398
properties:
4400-
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193158
4399+
os: Mac-26.6
44014400
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
44024401
dependencies: >-
44034402
[
@@ -6036,8 +6035,9 @@ targets:
60366035
tags: >
60376036
["devicelab", "ios", "mac"]
60386037
task_name: flutter_gallery__transition_perf_e2e_ios
6038+
# Keep os the same as "mac_build_test" platform_properties
60396039
drone_dimensions: >
6040-
["device_os=iOS-18|iOS-26","os=Mac-15.7", "cpu=x86"]
6040+
["device_os=iOS-18|iOS-26","os=Mac-26.6", "cpu=arm64"]
60416041
60426042
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
60436043
recipe: devicelab/devicelab_drone

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If this change needs to override an active code freeze, provide a comment explai
3232

3333
<!-- Links -->
3434
[Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
35-
[AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
35+
[AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/CONTRIBUTING.ai.md
3636
[Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
3737
[test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
3838
[Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
3232

3333
## Flutter 3.47 Changes
3434

35+
### [3.47.7](https://github.com/flutter/flutter/releases/tag/3.47.7)
36+
- [flutter/182604](https://github.com/flutter/flutter/issues/182604) When an OverlayPortal is displayed on iOS, accessibility frames are shrunk by the device pixel ratio and anchored to the top-left, so VoiceOver focus and XCUITest taps miss the visible controls.
37+
- [flutter/100946](https://github.com/flutter/flutter/issues/100946) When using VoiceOver on iOS with a ReorderableListView, Semantics focus is incorrectly shifted to the top left of the screen.
38+
3539
### [3.47.6](https://github.com/flutter/flutter/releases/tag/3.47.6)
3640
- [flutter/192513](https://github.com/flutter/flutter/issues/192513) Fixed an issue that caused Windows production apps to hang.
3741

‎CONTRIBUTING.ai.md‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# AI contribution policies
2+
3+
This document contains Flutter's policies around the use of AI assistants or
4+
agents when contributing to Flutter. We expect both humans and AI agents to
5+
follow the letter and spirit of these policies. If contributors notice behaviors
6+
that are not aligned with these policies, they should contact
7+
8+
9+
## Philosophy
10+
11+
A common question in discussions around AI policies for open source projects is:
12+
"Why have an AI policy at all? Why does it matter how the code was created;
13+
shouldn't the code speak for itself?"
14+
15+
In general, we agree, which is why our policy focuses on behaviors rather than
16+
tools. The behaviors that led to the creation of this policy are problematic
17+
regardless of whether they are AI-generated or human-generated. However, it is
18+
useful to highlight these policies in the context of AI because we have seen
19+
that these behaviors are orders of magnitude more common when AI is involved.
20+
For example:
21+
22+
* Submitting a PR containing hundreds of lines of code that the contributor
23+
doesn't understand is always a problem. This was rare before the widespread
24+
use of AI agents, but is more common with AI-assisted development.
25+
* Having several rounds of exchanges where a reviewer asks for a change, and the
26+
contributor says that they have made that change but haven't, is always a
27+
waste of reviewer time. It's very rare for a contributor to deliberately and
28+
obviously lie to a reviewer, but unfortunately common for contributors to
29+
uncritically repeat AI agent hallucinations.
30+
* Contributions that ignore our process have always been problematic, because
31+
standardizing the process is an important part of how we keep our triage and
32+
review load manageable. However, a contributor who has spent hours or days on
33+
a PR is much more likely to take some time to learn and follow our process to
34+
avoid having that effort be wasted than someone who spent a few minutes
35+
generating the PR.
36+
37+
Overall, regardless of the forum and whether by way of automation or manual
38+
unedited copy-and-paste, do not use AI to substitute for human discussion.
39+
40+
## Our CLA
41+
42+
All submissions to Google Open Source projects need to follow
43+
[Google's Contributor License Agreement (CLA)](https://cla.developers.google.com/),
44+
in which contributors agree that their contribution is an original work of
45+
authorship. This does not prohibit the use of coding assistance tools, but what
46+
is submitted needs to be the contributor's original creation.
47+
48+
## Issues and triage
49+
50+
Comments and reports in the issue database should add value (see
51+
[issue hygiene](./docs/contributing/issue_hygiene/README.md) and the
52+
[triage guide](./docs/triage/README.md)). Anyone can easily feed an issue URL
53+
into an agent, so just posting the results of doing that is generally not
54+
helpful.
55+
56+
* **Do not** run an unsupervised agent that posts triage comments to the issue
57+
database. Any automated agent needs to be approved in advance, after
58+
discussion with the Flutter team.
59+
* Use AI tools to help you contribute to an issue rather than as replacements
60+
for your contribution. AI tools may be helpful for specific tasks, such as
61+
creating reduced test cases or identifying potential duplicate issues, but you
62+
must verify their output. For example, if you use an AI tool to create a
63+
reduced test case, make sure that you can actually reproduce the issue before
64+
posting it.
65+
* Reproducible and concise issues respect maintainers' time. AI-generated output
66+
is often too verbose, inaccurate, and difficult to triage. You likely must
67+
**edit AI-generated text** to improve readability and focus on what is
68+
important.
69+
70+
## Pull requests
71+
72+
PRs prepared using AI tools must follow the standard
73+
[tree hygiene](./docs/contributing/Tree-hygiene.md) process and the
74+
[style guide](./docs/contributing/Style-guide-for-Flutter-repo.md), along with
75+
these requirements:
76+
77+
1. You must review all AI-generated code before opening a (non-draft) PR, and
78+
before requesting re-review of any updates to the PR.
79+
* You are responsible for making sure that code you submit meets the Flutter
80+
project's standards.
81+
* Unmodified AI output generally does not meet those standards.
82+
1. You must understand and be able to discuss the code in the PR.
83+
* Non-trivial PRs require discussion and iteration during review. If you do
84+
not understand the code, you cannot meaningfully respond to review
85+
feedback.
86+
* In our experience, simply feeding review feedback into an AI agent and
87+
uncritically reposting its output will not lead to a constructive review.
88+
1. You must verify the accuracy of any AI-generated text you include in the PR
89+
description or review discussion comments.
90+
* If an AI provides you incorrect information, it is just hallucinating; if
91+
you choose to paste that text into GitHub, you are misrepresenting your PR
92+
to your reviewer.
93+
* In particular, do not tell a reviewer that you have addressed their
94+
feedback just because AI output says so. It is your responsibility to make
95+
sure that review feedback has actually been addressed.
96+
97+
### Reviewer guidelines
98+
99+
Because the Flutter team's time is limited, and the capacity for people outside
100+
the team to generate plausible-looking code is unlimited, be mindful as a
101+
reviewer about what code you choose to review. Consider immediately closing PRs
102+
that have any of the following red flags:
103+
104+
* The PR description has entirely replaced our template with AI-generated
105+
output, and the PR is missing at least one obvious checklist item (tests,
106+
issue link, etc.).
107+
* If the contributor did not follow our process from the outset, they are
108+
unlikely to understand what is expected of them during review.
109+
* The PR description does not match the changes.
110+
* If the contributor did not review both the changes and the description
111+
enough to notice this, they have not followed the AI contribution policy.
112+
* The PR contains irrelevant AI-generated files, such as agent planning `.md`
113+
files.
114+
* If the contributor did not review the changes enough to notice and remove
115+
these files, they have not followed the AI contribution policy.
116+
117+
As always when closing a PR, explain why and provide next steps. In the case
118+
that the PR is closed for failing to follow our AI policies, the next steps
119+
would include linking to this document.
120+
121+
As a guiding principle, if at any point in the process you feel that you are
122+
getting unfiltered or minimally filtered AI output as code and/or comment
123+
responses, ask yourself:
124+
125+
* If this PR weren't here, would I choose to spend my time fixing this issue?
126+
* Would I choose to fix it using an AI agent that took hours or days to respond
127+
to every prompt?
128+
129+
Unless the answer to both questions is yes, the review is not a good use of your
130+
time.
131+
132+
This applies even if you are multiple rounds into the review: if the contributor
133+
closed the PR, would you take it over using an extremely high-latency agent?
134+
Beware the sunk cost fallacy.

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ Before you get started, we encourage you to read these documents which describe
3232
2. [Values](./docs/about/Values.md),
3333
which talks about what we care most about.
3434

35+
3. [AI contribution guidelines](CONTRIBUTING.ai.md),
36+
which describes our policies on using AI assistants when filing or
37+
triaging issues, submitting pull requests, and reviewing code.
38+
3539
Helping out in the issue database
3640
---------------------------------
3741

@@ -54,10 +58,6 @@ If you want to help us triage, you are very welcome to do so!
5458
provide enough details that you can reproduce the problem, pointing out duplicates,
5559
and so on. Chat on the #hackers-triage channel to let us know what you're up to!
5660

57-
* **Do not** run an unsupervised agent that posts triage comments to the issue database.
58-
Any automated agent needs to be approved in advance, after discussion with the
59-
Flutter team.
60-
6161
4. Familiarize yourself with our
6262
[issue hygiene](./docs/contributing/issue_hygiene/README.md) wiki page,
6363
which covers the meanings of some important GitHub labels and

‎DEPS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vars = {
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
1717
'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
18-
'skia_revision': '4401c6226f784182f05e2bbe2bcf3b3d5201ee8b',
18+
'skia_revision': '0580c2b780f622d3ae1a48b402c646590d129b2d',
1919

2020
# Do not download the Emscripten SDK by default.
2121
# This prevents us from downloading the Emscripten toolchain for builds
@@ -55,7 +55,7 @@ vars = {
5555
# updated revision list of existing dependencies. You will need to
5656
# gclient sync before and after update deps to ensure all deps are updated.
5757
# updated revision list of existing dependencies.
58-
'dart_revision': '16edd71d74e376dcea26c1476e18497b8d1ee80a',
58+
'dart_revision': '5933cb486b4aef2f8cf6b9f89a5651c0d5b0955e',
5959

6060
# WARNING: DO NOT EDIT MANUALLY
6161
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -68,7 +68,7 @@ vars = {
6868
'dart_i18n_rev': '1f5ea2fb2381bdf7bab054a43c0d69771f104561',
6969
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7070
'dart_protobuf_rev': 'a73edc98c98fb25152aa3f12c1b9db91594c1369',
71-
'dart_pub_rev': '4cdcec06b0c3b296018203180627454a8ae6b1bf',
71+
'dart_pub_rev': 'eca8f8ada939be70f0be3189db31e421dd0be7fd',
7272
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
7373
'dart_tools_rev': 'd87eaf7946e7939592c876ea6fb2fa1d72929efe',
7474
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',

‎analysis_options_common.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ linter:
8686
# - close_sinks # not reliable enough
8787
- collection_methods_unrelated_type
8888
- combinators_ordering
89-
# - comment_references # blocked on https://github.com/dart-lang/linter/issues/1142
89+
# - comment_references # blocked on https://github.com/dart-lang/sdk/issues/64540
9090
- conditional_uri_does_not_exist
9191
# - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
9292
- control_flow_in_finally
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
951f2f723e3d027b525c6429a75ab81e77e7b68f
1+
d8d9e97d2d02bf785084e7dc9409a79a49e75967

‎dev/bots/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ to Chromium's infra and the foundation to Flutter's infrastructure.
3535
To work on this infrastructure you will need:
3636

3737
- [depot_tools](https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up)
38+
- To use the `bb` or `led` command line tools: run `bb auth-login` / `led auth-login`.
39+
See [Using `bb` and `led` with LUCI](../../docs/infra/Using-bb-and-led.md).
3840
- Python package installer: `sudo apt-get install python-pip`
3941
- Python coverage package (only needed for `training_simulation`): `sudo pip install coverage`
4042

0 commit comments

Comments
 (0)