From 7b1d69606f4ad88fc5d4f78e2ae05175bf507307 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Tue, 25 Mar 2025 15:39:53 -0700 Subject: [PATCH] Remove problematic stream usage from `FlutterView` (#162024) Fixes https://github.com/flutter/flutter/issues/160945. We should figure out why this stream usage is problematic. See the comment here https://github.com/flutter/flutter/issues/160945#issuecomment-2590938971, that from what I can tell from Android docs it _shouldn't_ be problematic. But it is causing crashes, and I think it is reasonable to change it so that it doesn't cause crashes, until we can figure out how to stop the crashes. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [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 documentation (doc comments with `///`). - [ ] 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]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [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 [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 --- .../flutter/embedding/android/FlutterView.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java index 777e173c4f..82ba15fa89 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java @@ -109,6 +109,7 @@ import java.util.Set; public class FlutterView extends FrameLayout implements MouseCursorPlugin.MouseCursorViewDelegate, KeyboardManager.ViewDelegate { private static final String TAG = "FlutterView"; + private static final String GBOARD_PACKAGE_NAME = "com.google.android.inputmethod.latin"; // Internal view hierarchy references. @Nullable private FlutterSurfaceView flutterSurfaceView; @@ -1445,13 +1446,14 @@ public class FlutterView extends FrameLayout if (Build.VERSION.SDK_INT >= API_LEVELS.API_31) { List enabledSpellCheckerInfos = textServicesManager.getEnabledSpellCheckerInfos(); - boolean gboardSpellCheckerEnabled = - enabledSpellCheckerInfos.stream() - .anyMatch( - spellCheckerInfo -> - spellCheckerInfo - .getPackageName() - .equals("com.google.android.inputmethod.latin")); + boolean gboardSpellCheckerEnabled = false; + + for (SpellCheckerInfo spellCheckerInfo : enabledSpellCheckerInfos) { + if (spellCheckerInfo.getPackageName().equals(GBOARD_PACKAGE_NAME)) { + gboardSpellCheckerEnabled = true; + break; + } + } // Checks if enabled spell checker is the one that is suppported by Gboard, which is // the one Flutter supports by default.