DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix SparseArray lookup in PlatformViewsController (flutter/engine#32947)

Browse Source
This commit is contained in:
Emmanuel Garcia 2022-04-27 10:19:02 -07:00 committed by GitHub
parent 9442d7f394
commit 327986ef9b
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
View File

@ -541,16 +541,18 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
public void attachToView(@NonNull FlutterView newFlutterView) {
flutterView = newFlutterView;
// Add wrapper for platform views that use GL texture.
for (int viewId = 0; viewId < viewWrappers.size(); viewId++) {
flutterView.addView(viewWrappers.get(viewId));
for (int index = 0; index < viewWrappers.size(); index++) {
final PlatformViewWrapper view = viewWrappers.valueAt(index);
flutterView.addView(view);
}
// Add wrapper for platform views that are composed at the view hierarchy level.
for (int viewId = 0; viewId < platformViewParent.size(); viewId++) {
flutterView.addView(platformViewParent.get(viewId));
for (int index = 0; index < platformViewParent.size(); index++) {
final FlutterMutatorView view = platformViewParent.valueAt(index);
flutterView.addView(view);
}
// Notify platform views that they are now attached to a FlutterView.
for (int platformViewId = 0; platformViewId < platformViews.size(); platformViewId++) {
final PlatformView view = platformViews.valueAt(platformViewId);
for (int index = 0; index < platformViews.size(); index++) {
final PlatformView view = platformViews.valueAt(index);
view.onFlutterViewAttached(flutterView);
}
}
@ -564,12 +566,14 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
*/
public void detachFromView() {
// Remove wrapper for platform views that use GL texture.
for (int viewId = 0; viewId < viewWrappers.size(); viewId++) {
flutterView.removeView(viewWrappers.get(viewId));
for (int index = 0; index < viewWrappers.size(); index++) {
final PlatformViewWrapper view = viewWrappers.valueAt(index);
flutterView.removeView(view);
}
// Remove wrapper for platform views that are composed at the view hierarchy level.
for (int viewId = 0; viewId < platformViewParent.size(); viewId++) {
flutterView.removeView(platformViewParent.get(viewId));
for (int index = 0; index < platformViewParent.size(); index++) {
final FlutterMutatorView view = platformViewParent.valueAt(index);
flutterView.removeView(view);
}
destroyOverlaySurfaces();
removeOverlaySurfaces();
@ -577,8 +581,8 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
flutterViewConvertedToImageView = false;
// Notify that the platform view have been detached from FlutterView.
for (int platformViewId = 0; platformViewId < platformViews.size(); platformViewId++) {
final PlatformView view = platformViews.valueAt(platformViewId);
for (int index = 0; index < platformViews.size(); index++) {
final PlatformView view = platformViews.valueAt(index);
view.onFlutterViewDetached();
}
}

2
engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java
View File

@ -785,7 +785,7 @@ public class PlatformViewsControllerTest {
PlatformViewsController platformViewsController = new PlatformViewsController();
platformViewsController.setSoftwareRendering(true);
int platformViewId = 0;
int platformViewId = 100;
assertNull(platformViewsController.getPlatformViewById(platformViewId));
PlatformViewFactory viewFactory = mock(PlatformViewFactory.class);