diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java index 1986188c00..fdffce7739 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java @@ -109,8 +109,6 @@ public class FlutterEngine { pluginRegistry.detach(); dartExecutor.onDetachedFromJNI(); flutterJNI.removeEngineLifecycleListener(engineLifecycleListener); - // TODO(mattcarroll): investigate detach vs destroy. document user-cases. update code if needed. - flutterJNI.detachFromNativeButKeepNativeResources(); } /** diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java index 0ee86091ab..f2d194275c 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java @@ -392,15 +392,6 @@ public class FlutterJNI { private native long nativeAttach(FlutterJNI flutterJNI, boolean isBackgroundView); - @UiThread - public void detachFromNativeButKeepNativeResources() { - ensureAttachedToNative(); - nativeDetach(nativePlatformViewId); - nativePlatformViewId = null; - } - - private native void nativeDetach(long nativePlatformViewId); - @UiThread public void detachFromNativeAndReleaseResources() { ensureAttachedToNative(); diff --git a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java index 408449ee51..373aa792a9 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java @@ -50,7 +50,6 @@ public class FlutterNativeView implements BinaryMessenger { mPluginRegistry.detach(); dartExecutor.onDetachedFromJNI(); mFlutterView = null; - mFlutterJNI.detachFromNativeButKeepNativeResources(); } public void destroy() { diff --git a/engine/src/flutter/shell/platform/android/platform_view_android_jni.cc b/engine/src/flutter/shell/platform/android/platform_view_android_jni.cc index 97bcfb6dfe..b26f593990 100644 --- a/engine/src/flutter/shell/platform/android/platform_view_android_jni.cc +++ b/engine/src/flutter/shell/platform/android/platform_view_android_jni.cc @@ -160,11 +160,6 @@ static jlong AttachJNI(JNIEnv* env, } } -// TODO(mattcarroll): delete this method here and in FlutterJNI.java -static void DetachJNI(JNIEnv* env, jobject jcaller, jlong shell_holder) { - // Nothing to do. -} - static void DestroyJNI(JNIEnv* env, jobject jcaller, jlong shell_holder) { delete ANDROID_SHELL_HOLDER; } @@ -547,11 +542,6 @@ bool RegisterApi(JNIEnv* env) { .signature = "(Lio/flutter/embedding/engine/FlutterJNI;Z)J", .fnPtr = reinterpret_cast(&shell::AttachJNI), }, - { - .name = "nativeDetach", - .signature = "(J)V", - .fnPtr = reinterpret_cast(&shell::DetachJNI), - }, { .name = "nativeDestroy", .signature = "(J)V",