Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fix cast in FlutterView #30106

Merged
merged 2 commits into from
Dec 3, 2021
Merged

Fix cast in FlutterView #30106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c5211a
Fix cast in FlutterView
Dec 3, 2021
bd4f726
Merge remote-tracking branch 'upstream/master' into fix_cast
Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions shell/platform/android/io/flutter/embedding/android/FlutterView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import io.flutter.plugin.localization.LocalizationPlugin;
import io.flutter.plugin.mouse.MouseCursorPlugin;
import io.flutter.plugin.platform.PlatformViewsController;
import io.flutter.util.ViewUtils;
import io.flutter.view.AccessibilityBridge;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -455,7 +456,7 @@ protected WindowInfoRepositoryCallbackAdapterWrapper createWindowInfoRepo() {
try {
return new WindowInfoRepositoryCallbackAdapterWrapper(
new WindowInfoTrackerCallbackAdapter(
WindowInfoTracker.Companion.getOrCreate((Activity) getContext())));
WindowInfoTracker.Companion.getOrCreate(getContext())));
} catch (NoClassDefFoundError noClassDefFoundError) {
// Testing environment uses gn/javac, which does not work with aar files. This is why aar
// are converted to jar files, losing resources and other android-specific files.
Expand All @@ -476,9 +477,10 @@ protected WindowInfoRepositoryCallbackAdapterWrapper createWindowInfoRepo() {
protected void onAttachedToWindow() {
super.onAttachedToWindow();
this.windowInfoRepo = createWindowInfoRepo();
if (windowInfoRepo != null) {
Activity activity = ViewUtils.getActivity(getContext());
if (windowInfoRepo != null && activity != null) {
windowInfoRepo.addWindowLayoutInfoListener(
(Activity) getContext(), ContextCompat.getMainExecutor(getContext()), windowInfoListener);
activity, ContextCompat.getMainExecutor(getContext()), windowInfoListener);
}
}

Expand Down