Remove the method channel's reference to webview/maps on dispose. (#1221

) The reference from the method channel to the webview/maps instance was never cleared on Android, which leaked memory as even after disposing the platform view the view was not released. [flutter/flutter#24145](flutter/flutter#24145)
flutter · Feb 14, 2019 · 0f14f68 · 0f14f68
1 parent 9bf429d
commit 0f14f68
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+3
+
+* Fixed a memory leak on Android - the map was not properly disposed.
+
 ## 0.2.0+2
 
 * Log a more detailed warning at build time about the previous AndroidX

diff --git a/...maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/...maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -289,6 +289,7 @@ public void dispose() {
       return;
     }
     disposed = true;
+    methodChannel.setMethodCallHandler(null);
     mapView.onDestroy();
     registrar.activity().getApplication().unregisterActivityLifecycleCallbacks(this);
   }

diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+2
+version: 0.2.0+3
 
 dependencies:
   flutter:

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.3+1
+
+* Fixed a memory leak on Android - the WebView was not properly disposed.
+
 ## 0.3.3
 
 * Add clearCache method to WebView controller.

diff --git a/...bview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/...bview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -201,5 +201,7 @@ private void registerJavaScriptChannelNames(List<String> channelNames) {
   }
 
   @Override
-  public void dispose() {}
+  public void dispose() {
+    methodChannel.setMethodCallHandler(null);
+  }
 }
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.3
+version: 0.3.3+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter