flutter · amirh · Jul 26, 2019 · Jul 23, 2019 · Jul 23, 2019 · Jul 23, 2019
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.20+1
+
+* Android: Unregister ActivityLifecycleCallbacks on activity destroy (fixes a memory leak).
+
 ## 0.5.20
 
 * Add map toolbar support

diff --git a/...le_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java b/...le_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
@@ -88,6 +88,7 @@ public void onActivityDestroyed(Activity activity) {
     if (activity.hashCode() != registrarActivityHashCode) {
       return;
     }
+    activity.getApplication().unregisterActivityLifecycleCallbacks(this);
     state.set(DESTROYED);
   }
 

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 <[email protected]>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.20
+version: 0.5.20+1
 
 dependencies:
   flutter:
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,7 @@ public void onActivityDestroyed(Activity activity) { @@
         if (activity.hashCode() != registrarActivityHashCode) {
           return;
         }
+        activity.getApplication().unregisterActivityLifecycleCallbacks(this);
         state.set(DESTROYED);
       }
@@ Expand Down @@