Skip to content
This repository has been archived by the owner on Feb 25, 2025. It is now read-only.

I52370 3.22.cp attempt2 #52491

Merged
merged 2 commits into from
May 1, 2024
Merged

I52370 3.22.cp attempt2 #52491

merged 2 commits into from
May 1, 2024

Conversation

reidbaker
Copy link
Contributor

Includes #51494 to avoid merge conflicts and have a cleaner merge.

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] and the [C++, Objective-C, Java style guides].
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the [CLA].
  • All existing and new tests are passing.

gmackall and others added 2 commits May 1, 2024 11:34
@gmackall @reidbaker
Replace LinkedLists that are used as a queue in android FlutterRender…
07429ff 
…er with ArrayDeques (flutter#51494)

Inspired by flutter#50767.

[As their documentation notes](https://docs.oracle.com/javase/8/docs/api/java/util/ArrayDeque.html), `ArrayDeque`s are generally faster than LinkedList when used as a queue.

Fixes flutter/flutter#143721

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
@johnmccutchan @reidbaker
Workaround HardwareRenderer breakage in Android 14 (flutter#52370)
c9a1198 
- Destroy ImageReaders on memory trim.
- Unset the VirtualDisplay's surface on memory trim.
- On resume, recreate ImageReaders.
- On resume, do a dumb little dance and then set the VirtualDisplay's surface

Fixes: flutter/flutter#146499
Fixes: flutter/flutter#144219

Internal bug: b/335646931
Android Fix: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/27015418

Android 15 will include the fix. Unclear if Android 14 will be patched.
@reidbaker reidbaker mentioned this pull request May 1, 2024
Closed
@reidbaker
Copy link
Contributor Author

https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8749128145001891473/+/u/gn_--runtime-mode_release_--prebuilt-dart-sdk_--build-embedder-examples_--rbe_--no-goma_--rbe-server-address_unix:___b_s_w_ir_x_w_recipe_cleanup_rbe3qq5k01m_reproxy.sock_--no-lto/stdout

ERROR at //flutter/third_party/boringssl/BUILD.gn:16:34: Duplicate build argument declaration.
bssl_use_clang_integrated_as = false

Trying to figure out if this was related to the CP

@zanderso
Copy link
Member

zanderso commented May 1, 2024

I believe it is not related. There is a caching issue with the bots in the try pool. flutter/flutter#147651

@itsjustkevin itsjustkevin added the autosubmit Merge PR when tree becomes green via auto submit App label May 1, 2024
@auto-submit auto-submit bot merged commit 3793869 into flutter:flutter-3.22-candidate.0 May 1, 2024
23 checks passed
@reidbaker reidbaker deleted the i52370-3.22.cp-attempt2 branch May 7, 2024 15:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@johnmccutchan johnmccutchan johnmccutchan approved these changes

@itsjustkevin itsjustkevin itsjustkevin approved these changes

Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App platform-android
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@reidbaker @zanderso @johnmccutchan @itsjustkevin @gmackall