Skip to content

Commit 8e0eb93

Browse files
committed
Fix Huawei ImageReader issue (flutter#166481)
1 parent 4875f50 commit 8e0eb93

2 files changed

Lines changed: 35 additions & 1 deletion

File tree

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,19 @@ public class FlutterRenderer implements TextureRegistry {
6363
*/
6464
@VisibleForTesting public static boolean debugForceSurfaceProducerGlTextures = false;
6565

66+
/**
67+
* Returns true if this device has a known {@link android.hardware.HardwareBuffer} defect.
68+
*
69+
* <p>Huawei devices on API 29 or below have {@link android.media.ImageReader} issues that cause
70+
* video playback failures due to defective HardwareBuffer implementations.
71+
*
72+
* @see <a href="https://github.com/flutter/flutter/issues/166481">#166481</a>
73+
*/
74+
private static boolean hasAndroidHardwareBufferDefect() {
75+
return Build.VERSION.SDK_INT <= API_LEVELS.API_29
76+
&& "HUAWEI".equalsIgnoreCase(Build.MANUFACTURER);
77+
}
78+
6679
/** Whether to disable clearing of the Surface used to render platform views. */
6780
@VisibleForTesting public static boolean debugDisableSurfaceClear = false;
6881

@@ -199,7 +212,9 @@ private void clearDeadListeners() {
199212
@Override
200213
public SurfaceProducer createSurfaceProducer(SurfaceLifecycle lifecycle) {
201214
final SurfaceProducer entry;
202-
if (!debugForceSurfaceProducerGlTextures && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
215+
if (!debugForceSurfaceProducerGlTextures
216+
&& Build.VERSION.SDK_INT >= API_LEVELS.API_29
217+
&& !hasAndroidHardwareBufferDefect()) {
203218
final long id = nextTextureId.getAndIncrement();
204219
final ImageReaderSurfaceProducer producer = new ImageReaderSurfaceProducer(id);
205220
boolean reset = lifecycle == SurfaceLifecycle.resetInBackground;

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import org.junit.Test;
4545
import org.junit.runner.RunWith;
4646
import org.mockito.ArgumentCaptor;
47+
import org.robolectric.annotation.Config;
48+
import org.robolectric.shadows.ShadowBuild;
4749

4850
@RunWith(AndroidJUnit4.class)
4951
public class FlutterRendererTest {
@@ -823,6 +825,23 @@ public void SurfaceTextureSurfaceProducerDoesNotCropOrRotate() {
823825
}
824826
}
825827

828+
@Test
829+
@Config(sdk = 29)
830+
public void createSurfaceProducer_usesSurfaceTextureWhenHardwareBufferDefect() {
831+
// Setup: Simulate a Huawei device on API 29 where HardwareBuffer has known defects.
832+
// See: https://github.com/flutter/flutter/issues/166481
833+
ShadowBuild.setManufacturer("HUAWEI");
834+
835+
// Execute the behavior under test.
836+
FlutterRenderer flutterRenderer = engineRule.getFlutterEngine().getRenderer();
837+
TextureRegistry.SurfaceProducer producer = flutterRenderer.createSurfaceProducer();
838+
839+
// Verify: Should return SurfaceTextureSurfaceProducer instead of ImageReaderSurfaceProducer.
840+
assertTrue(
841+
"Expected SurfaceTextureSurfaceProducer on Huawei API <= 29 due to HardwareBuffer defect causing video playback failures",
842+
producer instanceof FlutterRenderer.SurfaceTextureSurfaceProducer);
843+
}
844+
826845
@Test
827846
public void ImageReaderSurfaceProducerDoesNotCropOrRotate() {
828847
FlutterRenderer flutterRenderer = engineRule.getFlutterEngine().getRenderer();

0 commit comments

Comments
 (0)