[Android 16] Bumped Android Defaults in Engine #166796

jesswrd · 2025-04-08T22:58:46Z

Following the directions here to update engine to android 16.

Uploaded api 36 SDK to CIPD using the script from the above docs
Updates in Engine to use api 36
- Updated buildroot
- Updated SDK CIPD package in DEPS
- Updated android build tools
- Updated targetsdk and compilesdk
Confirm the engine sucessfully builds. I ran et build -c android_debug_unopt_arm64
Bumped the gradle version in this PR due to seeing this warning here.

Note: Post mono-repo merge, we can now update buildroot and DEPS in the same PR 🎊 !!! Also, updated the Clang path due to use of a new Clang version in the bumped ndk.

Partially Addresses #166950

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

docs/platforms/android/Upgrading-Engine's-Android-API-version.md

…hange

docs/platforms/android/Upgrading-Engine's-Android-API-version.md

… update-engine-to-36

flutter-dashboard · 2025-04-10T22:14:09Z

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

ash2moon · 2025-04-10T23:02:30Z

Approved pending checks on any deprecations

jesswrd · 2025-04-11T17:43:41Z

Approved pending checks on any deprecations

It looks like deprecation warnings appeared when updating to API 35 (pr here) due to specific android 35 api updates outlined in the release notes here. I am not seeing any deprecation warnings when bumping to API 36.

Edit: confirmed the warnings were from CI when engine was bumped to 35

reidbaker · 2025-04-11T18:07:36Z

Approved pending checks on any deprecations

It looks like deprecation warnings appeared when updating to API 35 (pr here) due to specific android 35 api updates outlined in the release notes here. I am not seeing any deprecation warnings when bumping to API 36.

Edit: confirmed the warnings were from CI when engine was bumped to 35

What are you using to check for deprecation warnings?
I would expect that announceForAccessibility should show up since we know we have not removed that functionality.

https://android-developers.googleblog.com/2025/03/the-third-beta-of-android-16.html

gmackall · 2025-05-07T22:36:34Z

...hell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java

    recreateSurfaceIfNeeded();
-    if (surfaceTexture == null || surfaceTexture.isReleased()) {
-      return null;
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {


This is also a behavior change, right? What was the pre-change path like? Would this method (this.getSurface()) have been called on < api 26?

So the path wasn't removed. I'm wrapping the if statement with a check to ensure isReleased is called on >= api 26. This check is needed at this function because I removed @TargetApi(API_LEVELS.API_26) at the class level.

If it is a behavior change (but I think it isn't), it's required.

Hmm it is a behavior change though, right? Before, if called on api 25 the code would happily attempt to call
https://developer.android.com/reference/android/graphics/SurfaceTexture#isReleased()
and probably crash because that api was introduced in android api 26

But now if we try to call getSurface on api 25, we will return a value.

Probably the method should be annotated with @RequiresApi instead, right?

Probably the method should be annotated with @RequiresApi instead, right?

I say this because presumably before we weren't making a call to this method on API 25 as we would be crashing. So probably this method actually does require api 26+

Okay I see what you mean. I'm gonna change it.

...ne/src/flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java

gmackall

Looks close to good, added some questions

gmackall

lgtm!

reidbaker

Can you rerun the gradle lockfile script. I dont see anything in the current pr that should cause bytebuddy to bump in version.

flutter/flutter@02d8c1a...83082c1 2025-05-08 [email protected] [Widget Inspector] Clean-up changes in PR #167677 (flutter/flutter#168488) 2025-05-08 [email protected] Increased the limit where we start chopping off the end of blurs (flutter/flutter#168109) 2025-05-08 [email protected] Roll to Dart SDK 3.9 Beta 1 (flutter/flutter#168559) 2025-05-08 [email protected] Rename apple -> darwin across our buildroot (flutter/flutter#168558) 2025-05-08 [email protected] Update Engine to Android 16 (API 36) (flutter/flutter#166796) 2025-05-08 [email protected] Roll Skia from 43ae814d2d95 to efccaeb08b8d (5 revisions) (flutter/flutter#168554) 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

…#9232) flutter/flutter@02d8c1a...83082c1 2025-05-08 [email protected] [Widget Inspector] Clean-up changes in PR #167677 (flutter/flutter#168488) 2025-05-08 [email protected] Increased the limit where we start chopping off the end of blurs (flutter/flutter#168109) 2025-05-08 [email protected] Roll to Dart SDK 3.9 Beta 1 (flutter/flutter#168559) 2025-05-08 [email protected] Rename apple -> darwin across our buildroot (flutter/flutter#168558) 2025-05-08 [email protected] Update Engine to Android 16 (API 36) (flutter/flutter#166796) 2025-05-08 [email protected] Roll Skia from 43ae814d2d95 to efccaeb08b8d (5 revisions) (flutter/flutter#168554) 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

change for questions

2b0a700

github-actions bot added the d: docs/ flutter/flutter/docs, for contributors label Apr 8, 2025

jesswrd commented Apr 8, 2025

View reviewed changes

docs/platforms/android/Upgrading-Engine's-Android-API-version.md Show resolved Hide resolved

can't add comments on github unless it's changed has to be close to c…

cde9ce0

…hange

jesswrd commented Apr 8, 2025

View reviewed changes

docs/platforms/android/Upgrading-Engine's-Android-API-version.md Show resolved Hide resolved

jesswrd requested a review from matanlurey April 8, 2025 23:08

jesswrd changed the title ~~Update Engine to Android 16 (API 36)~~ [WIP] Update Engine to Android 16 (API 36) Apr 8, 2025

jesswrd removed the request for review from matanlurey April 9, 2025 18:23

uploaded android 36 with versions in packages.txt

98a5306

github-actions bot added the engine flutter/engine related. See also e: labels. label Apr 9, 2025

jesswrd added 4 commits April 9, 2025 14:16

updated buildroot in flutter/flutter engine

5abb35c

uploaded sdk 36 to cipd wtih these versions

2287092

Merge branch 'update-engine-to-36' of github.com:jesswrd/flutter into…

4241a0b

… update-engine-to-36

reverted doc changes

9b7e622

github-actions bot removed the d: docs/ flutter/flutter/docs, for contributors label Apr 9, 2025

upgrade to 36

8f34088

github-actions bot added the platform-android Android applications specifically label Apr 10, 2025

jesswrd and others added 3 commits April 10, 2025 14:12

Merge branch 'master' into update-engine-to-36

25b2af1

new ndk has update clang version so update clang path

8b0584c

Merge branch 'update-engine-to-36' of github.com:jesswrd/flutter into…

0ef42b0

… update-engine-to-36

jesswrd changed the title ~~[WIP] Update Engine to Android 16 (API 36)~~ Update Engine to Android 16 (API 36) Apr 10, 2025

jesswrd marked this pull request as ready for review April 10, 2025 22:13

jesswrd requested a review from a team April 10, 2025 22:13

ash2moon approved these changes Apr 10, 2025

View reviewed changes

jesswrd requested a review from camsim99 April 11, 2025 17:44

jesswrd added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 11, 2025

jesswrd requested a review from gmackall May 7, 2025 21:38

gmackall reviewed May 7, 2025

View reviewed changes

...ne/src/flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java Show resolved Hide resolved

gmackall reviewed May 7, 2025

View reviewed changes

jesswrd added 2 commits May 7, 2025 16:33

added @RequiresApi tag around getSurface

2794d7d

et format

dcac90d

jesswrd requested review from gmackall and reidbaker May 7, 2025 23:36

gmackall approved these changes May 8, 2025

View reviewed changes

reidbaker approved these changes May 8, 2025

View reviewed changes

revert lockfiles

7257997

jesswrd added the autosubmit Merge PR when tree becomes green via auto submit App label May 8, 2025

auto-submit bot added this pull request to the merge queue May 8, 2025

Merged via the queue into flutter:master with commit f8b544a May 8, 2025
178 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 8, 2025

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 9, 2025

f8b544a7f Update Engine to Android 16 (API 36) (flutter/flutter#166796)

6ecd221

engine-flutter-autoroll mentioned this pull request May 9, 2025

Roll Flutter from 02d8c1aceb75 to 83082c19b727 (6 revisions) flutter/packages#9232

Merged

Piinks mentioned this pull request May 9, 2025

Flutter Notable Commits - 2025 #161460

Open

jesswrd mentioned this pull request Jun 10, 2025

☔ Android 16 api 36 topline tracking bug #163071

Open

25 tasks

jesswrd changed the title ~~Update Engine to Android 16 (API 36)~~ [Android 16] Bumped Android Defaults in Engine Jun 10, 2025

jesswrd mentioned this pull request Jun 18, 2025

Update Engine to Android API 36 #166950

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

f8b544a7f Update Engine to Android 16 (API 36) (flutter/flutter#166796)

6827467

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

f8b544a7f Update Engine to Android 16 (API 36) (flutter/flutter#166796)

b0cfac7

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

f8b544a7f Update Engine to Android 16 (API 36) (flutter/flutter#166796)

9581994

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

f8b544a7f Update Engine to Android 16 (API 36) (flutter/flutter#166796)

ea69752

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2025

f8b544a7f Update Engine to Android 16 (API 36) (flutter/flutter#166796)

00a0a71

[Android 16] Bumped Android Defaults in Engine #166796

[Android 16] Bumped Android Defaults in Engine #166796

Uh oh!

Conversation

jesswrd commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

Uh oh!

Uh oh!

flutter-dashboard bot commented Apr 10, 2025

Uh oh!

ash2moon commented Apr 10, 2025

Uh oh!

jesswrd commented Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

reidbaker commented Apr 11, 2025

Uh oh!

gmackall May 7, 2025

Choose a reason for hiding this comment

Uh oh!

jesswrd May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gmackall May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gmackall May 7, 2025

Choose a reason for hiding this comment

Uh oh!

jesswrd May 7, 2025

Choose a reason for hiding this comment

Uh oh!

jesswrd May 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

gmackall left a comment

Choose a reason for hiding this comment

Uh oh!

gmackall left a comment

Choose a reason for hiding this comment

Uh oh!

reidbaker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jesswrd commented Apr 8, 2025 •

edited

Loading

jesswrd commented Apr 11, 2025 •

edited

Loading

jesswrd May 7, 2025 •

edited

Loading

gmackall May 7, 2025 •

edited

Loading