fix-huawei-imagereader-166481 by serbandin · Pull Request #181931 · flutter/flutter

serbandin · 2026-02-04T23:51:51Z

Fixes video playback issues on Huawei devices running Android API level 29 or below by falling back to SurfaceTextureSurfaceProducer instead of ImageReaderSurfaceProducer.

Problem

On certain Huawei devices with Android 10 (API 29), video playback fails when using ImageReaderSurfaceProducer. This is due to issues with AHB (Android Hardware Buffer) imports on these devices, similar to the Vulkan fallback already implemented in android_context_dynamic_impeller.cc. Fixes #166481

Solution

Added a new JNI method shouldDisableImageReader() that detects Huawei devices by checking the ro.com.google.clientidbase system property for the value "android-huawei" when the API level is 29 or below. When this method returns true, FlutterRenderer.createSurfaceProducer() uses SurfaceTextureSurfaceProducer instead of ImageReaderSurfaceProducer, which resolves the video playback issue.

Changes

FlutterJNI.java: Added shouldDisableImageReader() method and native bridge
platform_view_android_jni_impl.cc: Native implementation using __system_property_get() and android_get_device_api_level()
FlutterRenderer.java: Integration in createSurfaceProducer() condition (line 230)
FlutterRendererTest.java: Unit test for the new behavior

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.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. 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.

serbandin · 2026-02-05T00:10:24Z

The issue this PR tries to solve appeared in flutter 3.29.2 released on 13/03/2025. From my investigations I believe it was introduced by this PR: #164201

The PR disabled Vulkan on Huawei api 29 so it falls back to OpenGLES but OpenGLES still uses ImageReader. So I tried to add back the logic from && !flutterJNI.ShouldDisableAHB()

gemini-code-assist

Code Review

This pull request introduces a fix for video playback issues on certain Huawei devices running Android API level 29 or below. The solution involves adding a native check to detect this specific device configuration and then falling back to SurfaceTextureSurfaceProducer instead of ImageReaderSurfaceProducer. The implementation is well-contained, spanning Java and C++ with the necessary JNI bindings, and is accompanied by a unit test to validate the new behavior. The changes appear correct and effectively address the reported issue.

engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc

reidbaker · 2026-02-06T18:49:14Z

Adding @gaaclarke TL of the engine team since the author of that pr is no longer a full time contributor to flutter.

@gaaclarke if you are not the right person to review this can you find someone on your team who is? Second question what test should we author to prevent a regression on this issue in the engine? Do you need the android team to add huawei emulators or is there something lower level that should be tested.

reidbaker · 2026-02-06T18:51:43Z

@serbandin thank you so much for your contribution.

reidbaker · 2026-02-06T18:52:52Z

engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

+  private native boolean nativeShouldDisableImageReader();
+
+  /**
+   * Checks if ImageReader should be disabled for this device.


nit: can you link to the source for which ImageReader that is keyword that can lead to a lot of different types of code.

reidbaker · 2026-02-06T18:53:41Z

engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

+  /**
+   * Checks if ImageReader should be disabled for this device.
+   *
+   * <p>Returns true for Huawei devices on API level 29 or below due to known issues with


Other than than the bug is there any other source we can point to that says that imagereader is known to not work on huawei devices?

maybe bromite/bromite#814

There are a lot of old issue with Huawei not playing videos on api 29.
#156459
#154068
Also here's an old PR that fixed it initially: flutter/engine#54879
Seems to be related to the OMX.hisi.* Decoder. It happens on Kirin 710/970/980 from what I saw in the comments / tested myself.

gaaclarke

@reidbaker I don't know about wether we want to disable the image reader or not on certain devices. I'll let the Android team decide on that. Ideally the linked issue should provide enough documentation.

I think we should avoid doing JNI here since the check can happen with the java apis.

gaaclarke · 2026-02-06T21:20:09Z

...er/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java

+    // SurfaceTextureSurfaceProducer handles crop and rotation, ImageReaderSurfaceProducer does not.
+    assertTrue(producer.handlesCropAndRotation());


I'd prefer a more apropos assertion instead of relying on secondary information to test what you really want.

gaaclarke · 2026-02-06T21:22:20Z

engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc

+// Huawei devices on API level 29 and below have known issues with
+// ImageReader. This check is used to disable ImageReader on affected devices.
+static jboolean ShouldDisableImageReader(JNIEnv* env, jobject jcaller) {
+  constexpr int kHuaweiMaxApiLevel = 29;
+  constexpr char kAndroidHuawei[] = "android-huawei";
+  constexpr char kClientIdBaseProperty[] = "ro.com.google.clientidbase";
+
+  if (android_get_device_api_level() > kHuaweiMaxApiLevel) {
+    return false;
+  }
+
+  char property[PROP_VALUE_MAX];
+  __system_property_get(kClientIdBaseProperty, property);
+  return strcmp(property, kAndroidHuawei) == 0;
+}


I don't believe there is any reason we have to use JNI for this. I think this same test can be performed from java.

a check like this in java would be better?

return Build.VERSION.SDK_INT <= API_LEVELS.API_29 && "HUAWEI".equalsIgnoreCase(Build.MANUFACTURER);

Yes, avoiding JNI is a win.

camsim99

Looks good to me overall--just one nit and a question!

camsim99 · 2026-02-09T17:43:06Z

...src/flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java

+   *
+   * @see <a href="https://github.com/flutter/flutter/issues/166481">#166481</a>
+   */
+  private static boolean hasImageReaderIssue() {


Small thing: I would prefer a name that is more specific to the issue at hand like hasAndroidHardwareBufferDefect or requiresSurfaceTextureSurfaceProducer.

engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc

camsim99

This approach LGTM thanks for the fixes!

camsim99 · 2026-02-17T18:36:40Z

...er/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java

+    // Verify: Should return SurfaceTextureSurfaceProducer instead of ImageReaderSurfaceProducer.
+    assertTrue(
+        "Expected SurfaceTextureSurfaceProducer on Huawei API <= 29 due to HardwareBuffer defect causing video playback failures",
+        producer instanceof FlutterRenderer.SurfaceTextureSurfaceProducer);


Looks like you're missing an import

/b/s/w/ir/cache/builder/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java:842: error: cannot find symbol producer instanceof FlutterRenderer.SurfaceTextureSurfaceProducer); ^ symbol: class SurfaceTextureSurfaceProducer location: class FlutterRenderer 1 error

reidbaker · 2026-02-17T22:05:22Z

After the test pass we would like @gaaclarke or another engine team member approval.
Engine team fwiw this is a pretty bad bug on a non trivial number of devices that has been broken for a while. If we dont take this pr we will want to do something else.

gaaclarke

Changes looks good, the code is adequately tested. I don't know if we can definitively know all the values of Build.MANUFACTURER to make sure we catch everything, but this is progress regardless. I'll defer to the Android team as to wether they want the change or not (sounds like they do!)

Co-authored-by: Reid Baker <1063596+reidbaker@users.noreply.github.com>

auto-submit · 2026-02-20T18:47:25Z

auto label is removed for flutter/flutter/181931, Failed to enqueue flutter/flutter/181931 with HTTP 400: GraphQL mutate failed.

serbandin · 2026-02-20T21:48:47Z

auto label is removed for flutter/flutter/181931, Failed to enqueue flutter/flutter/181931 with HTTP 400: GraphQL mutate failed.

@reidbaker, first of all thanks for the review + all the suggestions! Wanted to ask you if you have idea why the bot removed the auto-submit label? Should I do an interactive rebase on master and remove the merge commits?

reidbaker · 2026-02-20T21:53:29Z

I don't have a link handy but we are having an outage on our side. Don't worry about it and I will try to get this landed Monday after our outage is resolved. No action needed from you

auto-submit · 2026-02-24T20:38:38Z

autosubmit label was removed for flutter/flutter/181931, because - The status or check suite Linux linux_unopt has failed. Please fix the issues identified (or deflake) before re-applying this label.

camsim99 · 2026-02-24T20:46:30Z

@serbandin the failure is legitimate; looks like you need to run the formatter! https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8688955671889939393/+/u/test:_test:_Check_formatting/stdout#:~:text=To%20fix%2C%20run%20%60et%20format%60%20or has the fix

serbandin · 2026-02-24T20:49:31Z

@serbandin the failure is legitimate; looks like you need to run the formatter! https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8688955671889939393/+/u/test:_test:_Check_formatting/stdout#:~:text=To%20fix%2C%20run%20%60et%20format%60%20or has the fix

hmm seems that it happened after last comments pushed via suggestion. Thanks! I will run it

serbandin · 2026-02-25T10:02:52Z

@camsim99 I applied the format suggestion, now the tests are passing

serbandin requested a review from a team as a code owner February 4, 2026 23:51

github-actions bot added platform-android Android applications specifically engine flutter/engine related. See also e: labels. team-android Owned by Android platform team labels Feb 4, 2026

gemini-code-assist bot reviewed Feb 5, 2026

View reviewed changes

engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc Outdated Show resolved Hide resolved

serbandin mentioned this pull request Feb 5, 2026

Video player on Android 29 device does not play media #166481

Closed

camsim99 self-requested a review February 5, 2026 00:28

serbandin force-pushed the fix-huawei-imagereader-166481 branch 2 times, most recently from cad4f69 to 401c39b Compare February 5, 2026 21:38

reidbaker requested a review from gaaclarke February 6, 2026 18:49

reidbaker reviewed Feb 6, 2026

View reviewed changes

gaaclarke reviewed Feb 6, 2026

View reviewed changes

serbandin force-pushed the fix-huawei-imagereader-166481 branch from 401c39b to 3163712 Compare February 7, 2026 00:04

camsim99 reviewed Feb 9, 2026

View reviewed changes

serbandin force-pushed the fix-huawei-imagereader-166481 branch 5 times, most recently from dca1aa6 to 8e0eb93 Compare February 14, 2026 04:01

serbandin requested review from camsim99, gaaclarke and reidbaker February 17, 2026 06:05

camsim99 approved these changes Feb 17, 2026

View reviewed changes

camsim99 reviewed Feb 17, 2026

View reviewed changes

gaaclarke approved these changes Feb 17, 2026

View reviewed changes

serbandin and others added 3 commits February 19, 2026 23:30

Update FlutterRenderer.java

f28e41f

Co-authored-by: Reid Baker <1063596+reidbaker@users.noreply.github.com>

Update FlutterRenderer.java

0b8d13b

Co-authored-by: Reid Baker <1063596+reidbaker@users.noreply.github.com>

Merge branch 'master' into fix-huawei-imagereader-166481

0c9d798

reidbaker approved these changes Feb 20, 2026

View reviewed changes

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 20, 2026

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 20, 2026

Merge branch 'master' into fix-huawei-imagereader-166481

a173553

Merge branch 'master' into fix-huawei-imagereader-166481

b54d777

camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 24, 2026

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 24, 2026

format fix

fa0473d

serbandin force-pushed the fix-huawei-imagereader-166481 branch from 6c547f0 to fa0473d Compare February 24, 2026 22:23

serbandin added 2 commits February 25, 2026 00:23

Merge branch 'master' into fix-huawei-imagereader-166481

8900c78

Merge branch 'master' into fix-huawei-imagereader-166481

f349f66

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 25, 2026

auto-submit bot added this pull request to the merge queue Feb 25, 2026

Merged via the queue into flutter:master with commit bcdd691 Feb 25, 2026
183 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 25, 2026

engine-flutter-autoroll mentioned this pull request Feb 25, 2026

Roll Flutter from dad6f9d4107a to bcdd691f3b1a (40 revisions) flutter/packages#11117

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 25, 2026

bcdd691f3 fix-huawei-imagereader-166481 (flutter/flutter#181931)

d038980

engine-flutter-autoroll mentioned this pull request Feb 25, 2026

Roll Flutter from dad6f9d4107a to 26c4cd4e4a06 (41 revisions) flutter/packages#11119

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 25, 2026

bcdd691f3 fix-huawei-imagereader-166481 (flutter/flutter#181931)

cb20491

		// SurfaceTextureSurfaceProducer handles crop and rotation, ImageReaderSurfaceProducer does not.
		assertTrue(producer.handlesCropAndRotation());

Conversation

serbandin commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Changes

Pre-launch Checklist

Uh oh!

serbandin commented Feb 5, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

reidbaker commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

reidbaker commented Feb 6, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gaaclarke left a comment • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camsim99 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

camsim99 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

reidbaker commented Feb 17, 2026

Uh oh!

gaaclarke left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Feb 20, 2026

Uh oh!

serbandin commented Feb 20, 2026

Uh oh!

reidbaker commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

auto-submit bot commented Feb 24, 2026

Uh oh!

camsim99 commented Feb 24, 2026

Uh oh!

serbandin commented Feb 24, 2026

Uh oh!

serbandin commented Feb 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

serbandin commented Feb 4, 2026 •

edited

Loading

reidbaker commented Feb 6, 2026 •

edited

Loading

gaaclarke left a comment •

edited

Loading

reidbaker commented Feb 20, 2026 •

edited

Loading