Skip to content

Instantly share code, notes, and snippets.

@gmackall
Last active October 20, 2026 18:42
Show Gist options
  • Select an option

  • Save gmackall/44d56a90a3b4e5699539f6ff874821f3 to your computer and use it in GitHub Desktop.

Select an option

Save gmackall/44d56a90a3b4e5699539f6ff874821f3 to your computer and use it in GitHub Desktop.
Sketch for flutter/flutter#193441 / #188303: keep PlatformViews on ImageReaderSurfaceProducer on Huawei API 29
# Rough sketch for flutter/flutter#193441 / #188303 (note: illustrative diff, may not git-apply cleanly):
#
# Keep PlatformViews (`PlatformViewsController.makePlatformViewRenderTarget`) on
# `ImageReaderSurfaceProducer` on API 29+, while preserving the
# `SurfaceTextureSurfaceProducer` fallback (#181931) for external texture plugins
# (`TextureRegistry.createSurfaceProducer`) such as `video_player` (#166481).
#
# The bypass is an explicit engine-internal entry point rather than keying off
# `SurfaceLifecycle.resetInBackground`, because third-party plugins (including
# ExoPlayer-based video plugins) can also pass `resetInBackground` to the public
# `createSurfaceProducer` API and must keep the #166481 fallback.
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
@@ -223,10 +223,32 @@ public class FlutterRenderer implements TextureRegistry {
@NonNull
@Override
public SurfaceProducer createSurfaceProducer(SurfaceLifecycle lifecycle) {
+ return createSurfaceProducerInternal(lifecycle, /* bypassHardwareBufferDefect= */ false);
+ }
+
+ /**
+ * Creates a {@link SurfaceProducer} for a PlatformView render target, bypassing {@link
+ * #hasAndroidHardwareBufferDefect()}.
+ *
+ * <p>PlatformViews do not connect {@code MediaCodec} directly to the {@code ImageReader} surface,
+ * so the video decoder workaround from #181931 does not apply and breaks {@code TextureView}
+ * PlatformViews (#188303).
+ *
+ * <p>Engine-internal: intended only for {@code PlatformViewsController}. Plugins and apps
+ * should use {@link #createSurfaceProducer(SurfaceLifecycle)}.
+ */
+ @NonNull
+ public SurfaceProducer createPlatformViewSurfaceProducer(@NonNull SurfaceLifecycle lifecycle) {
+ return createSurfaceProducerInternal(lifecycle, /* bypassHardwareBufferDefect= */ true);
+ }
+
+ @NonNull
+ private SurfaceProducer createSurfaceProducerInternal(
+ SurfaceLifecycle lifecycle, boolean bypassHardwareBufferDefect) {
final SurfaceProducer entry;
if (!debugForceSurfaceProducerGlTextures
&& Build.VERSION.SDK_INT >= API_LEVELS.API_29
- && !hasAndroidHardwareBufferDefect()) {
+ && (bypassHardwareBufferDefect || !hasAndroidHardwareBufferDefect())) {
final long id = nextTextureId.getAndIncrement();
final ImageReaderSurfaceProducer producer = new ImageReaderSurfaceProducer(id);
boolean reset = lifecycle == SurfaceLifecycle.resetInBackground;
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
--- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
@@ -1055,7 +1055,9 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
? TextureRegistry.SurfaceLifecycle.resetInBackground
: TextureRegistry.SurfaceLifecycle.manual;
final TextureRegistry.SurfaceProducer textureEntry =
- textureRegistry.createSurfaceProducer(lifecycle);
+ textureRegistry instanceof FlutterRenderer
+ ? ((FlutterRenderer) textureRegistry).createPlatformViewSurfaceProducer(lifecycle)
+ : textureRegistry.createSurfaceProducer(lifecycle);
Log.i(TAG, "PlatformView is using SurfaceProducer backend");
return new SurfaceProducerPlatformViewRenderTarget(textureEntry);
}
diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
@@ -843,6 +843,39 @@ public class FlutterRendererTest {
producer instanceof SurfaceTextureSurfaceProducer);
}
+ @Test
+ @Config(sdk = 29)
+ public void createPlatformViewSurfaceProducer_usesImageReaderWhenHardwareBufferDefect() {
+ // Setup: Simulate a Huawei device on API 29. PlatformViews should stay on
+ // ImageReaderSurfaceProducer (https://github.com/flutter/flutter/issues/188303).
+ ShadowBuild.setManufacturer("HUAWEI");
+
+ FlutterRenderer flutterRenderer = engineRule.getFlutterEngine().getRenderer();
+ TextureRegistry.SurfaceProducer producer =
+ flutterRenderer.createPlatformViewSurfaceProducer(
+ TextureRegistry.SurfaceLifecycle.resetInBackground);
+
+ assertTrue(
+ "Expected ImageReaderSurfaceProducer for PlatformViews on Huawei API 29",
+ producer instanceof FlutterRenderer.ImageReaderSurfaceProducer);
+ }
+
+ @Test
+ @Config(sdk = 29)
+ public void createSurfaceProducer_pluginResetInBackgroundKeepsHardwareBufferFallback() {
+ // Setup: Simulate a Huawei device on API 29. Plugins (e.g. ExoPlayer-based video plugins) may
+ // also pass resetInBackground and must keep the #166481 fallback; only PlatformViews bypass it.
+ ShadowBuild.setManufacturer("HUAWEI");
+
+ FlutterRenderer flutterRenderer = engineRule.getFlutterEngine().getRenderer();
+ TextureRegistry.SurfaceProducer producer =
+ flutterRenderer.createSurfaceProducer(TextureRegistry.SurfaceLifecycle.resetInBackground);
+
+ assertTrue(
+ "Expected SurfaceTextureSurfaceProducer for plugin surface producers on Huawei API 29",
+ producer instanceof SurfaceTextureSurfaceProducer);
+ }
+
@Test
public void ImageReaderSurfaceProducerDoesNotCropOrRotate() {
FlutterRenderer flutterRenderer = engineRule.getFlutterEngine().getRenderer();
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment