Do not drop the DartExecutor's message handler when a FlutterNativeView is detached from the FlutterView (flutter#8254)

jason-simmons · web-flow · commit 68bd4f2c6479 · 2019-03-21T18:08:58.000-07:00
An activity can use ViewFactory.retainNativeFlutterView to reuse a
FlutterNativeView across multiple instances of the activity.  In this
scenario, the FlutterNativeView should continue to handle incoming messages
sent from Dart.
diff --git a/shell/platform/android/io/flutter/view/FlutterNativeView.java b/shell/platform/android/io/flutter/view/FlutterNativeView.java
@@ -47,9 +47,8 @@ public FlutterNativeView(@NonNull Context context, boolean isBackgroundView) {
         assertAttached();
     }
 
-    public void detach() {
+    public void detachFromFlutterView() {
         mPluginRegistry.detach();
-        dartExecutor.onDetachedFromJNI();
         mFlutterView = null;
     }
 
diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java
@@ -346,7 +346,7 @@ public FlutterNativeView detach() {
         if (!isAttached())
             return null;
         getHolder().removeCallback(mSurfaceCallback);
-        mNativeView.detach();
+        mNativeView.detachFromFlutterView();
 
         FlutterNativeView view = mNativeView;
         mNativeView = null;

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,8 @@ public FlutterNativeView(@NonNull Context context, boolean isBackgroundView) {`
`47`	`47`	`assertAttached();`
`48`	`48`	`}`
`49`	`49`
`50`		`- public void detach() {`
	`50`	`+ public void detachFromFlutterView() {`
`51`	`51`	`mPluginRegistry.detach();`
`52`		`- dartExecutor.onDetachedFromJNI();`
`53`	`52`	`mFlutterView = null;`
`54`	`53`	`}`
`55`	`54`