Skip to content

Commit 55d20ce

Browse files
gmackallGray Mackall
authored andcommitted
Remove problematic stream usage from FlutterView (flutter#162024)
Fixes flutter#160945. We should figure out why this stream usage is problematic. See the comment here flutter#160945 (comment), 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]. <!-- Links --> [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 <mackall@google.com>
1 parent 477c16d commit 55d20ce

File tree

1 file changed

+9
-7
lines changed
  • engine/src/flutter/shell/platform/android/io/flutter/embedding/android

1 file changed

+9
-7
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
public class FlutterView extends FrameLayout
110110
implements MouseCursorPlugin.MouseCursorViewDelegate, KeyboardManager.ViewDelegate {
111111
private static final String TAG = "FlutterView";
112+
private static final String GBOARD_PACKAGE_NAME = "com.google.android.inputmethod.latin";
112113

113114
// Internal view hierarchy references.
114115
@Nullable private FlutterSurfaceView flutterSurfaceView;
@@ -1445,13 +1446,14 @@ public void removeFlutterEngineAttachmentListener(
14451446
if (Build.VERSION.SDK_INT >= API_LEVELS.API_31) {
14461447
List<SpellCheckerInfo> enabledSpellCheckerInfos =
14471448
textServicesManager.getEnabledSpellCheckerInfos();
1448-
boolean gboardSpellCheckerEnabled =
1449-
enabledSpellCheckerInfos.stream()
1450-
.anyMatch(
1451-
spellCheckerInfo ->
1452-
spellCheckerInfo
1453-
.getPackageName()
1454-
.equals("com.google.android.inputmethod.latin"));
1449+
boolean gboardSpellCheckerEnabled = false;
1450+
1451+
for (SpellCheckerInfo spellCheckerInfo : enabledSpellCheckerInfos) {
1452+
if (spellCheckerInfo.getPackageName().equals(GBOARD_PACKAGE_NAME)) {
1453+
gboardSpellCheckerEnabled = true;
1454+
break;
1455+
}
1456+
}
14551457

14561458
// Checks if enabled spell checker is the one that is suppported by Gboard, which is
14571459
// the one Flutter supports by default.

0 commit comments

Comments
 (0)