Repository navigation
Commit 945b567
[Android] Skip the HardwareBuffer defect fallback for platform views (flutter#193441)
PR flutter#181931 (the fix for flutter#166481) made
`FlutterRenderer.createSurfaceProducer()` return
`SurfaceTextureSurfaceProducer` on Huawei devices with API <= 29. That
fallback is for plugins like `video_player`, which pass the producer's
surface straight to `MediaCodec`. Platform views call the same method
for Texture Layer Hybrid Composition, so they got the fallback too. On
Huawei JNY-LX1 / Android 10 this makes a TextureView with OpenGL content
inside an `AndroidView` blank or frozen (flutter#188303).
This keeps platform views on `ImageReaderSurfaceProducer` on API 29+, as
it was from 3.29.2 to 3.41:
- New
`FlutterRenderer.createPlatformViewSurfaceProducer(SurfaceLifecycle)`
creates a producer without the HardwareBuffer defect check. The API 29
requirement and `debugForceSurfaceProducerGlTextures` still apply.
- `PlatformViewsController.makePlatformViewRenderTarget` uses it when
the texture registry is a `FlutterRenderer`.
- `createSurfaceProducer()` is unchanged, so plugins keep the flutter#166481
fallback.
Apps do not need to change anything.
Fixes flutter#188303. Related to flutter#166481 and flutter#181931.
Testing:
- `FlutterRendererTest`: platform view producer uses ImageReader on
Huawei API 29 and SurfaceTexture below API 29, plugin producers with
`resetInBackground` keep the fallback.
- `PlatformViewsControllerTest`: texture layer composition asks
`FlutterRenderer` for the platform view producer and not for the plugin
one.
- Both test classes pass with the Java embedding compiled from this
branch.
- Device: Huawei JNY-LX1 / Android 10, our app in release mode with the
same change applied to the Flutter 3.47.5 embedding. The map platform
view renders and keeps updating after panning. With the stock 3.47.5
embedding the same build shows the first map frame and then stops
updating, panning moves the Flutter UI on top but not the map.
- Device: the flutter#188303 repro app extended with `video_player`
(https://github.com/luskan/flutter_textureview_platform_view), same
device and 3.47.5. With this change both the TextureView platform view
and the video keep updating. With stock 3.47.5 the platform view
freezes. With a process wide override to ImageReader the video fails
with the flutter#166481 ACodec error.
## Pre-launch Checklist
- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [AI contribution guidelines] and understand my
responsibilities, or I am not using AI tools.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant in-code documentation (doc comments with
///).
- [x] If this PR introduces a new feature or capability, I created and
linked a website documentation issue or PR in [flutter/website] (or
verified none is needed).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] 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].
If this change needs to override an active code freeze, provide a
comment explaining why. The code freeze workflow can be overridden by
code reviewers. See pinned issues for any active code freezes with
guidance.
**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the gemini-code-assist bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.
<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[AI contribution guidelines]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[flutter/website]: https://github.com/flutter/website
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
Co-authored-by: Gray Mackall <[email protected]>1 parent 29625ca commit 945b567
4 files changed
Lines changed: 102 additions & 2 deletions
File tree
- engine/src/flutter/shell/platform/android
- io/flutter
- embedding/engine/renderer
- plugin/platform
- test/io/flutter
- embedding/engine/renderer
- plugin/platform
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
223 | 223 | | |
224 | 224 | | |
225 | 225 | | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
226 | 249 | | |
227 | 250 | | |
228 | 251 | | |
229 | | - | |
| 252 | + | |
230 | 253 | | |
231 | 254 | | |
232 | 255 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1050 | 1050 | | |
1051 | 1051 | | |
1052 | 1052 | | |
1053 | | - | |
| 1053 | + | |
| 1054 | + | |
| 1055 | + | |
1054 | 1056 | | |
1055 | 1057 | | |
1056 | 1058 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
842 | 842 | | |
843 | 843 | | |
844 | 844 | | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
845 | 883 | | |
846 | 884 | | |
847 | 885 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
192 | 192 | | |
193 | 193 | | |
194 | 194 | | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
195 | 232 | | |
196 | 233 | | |
197 | 234 | | |
| |||
0 commit comments