[android] Refcount the view activations

Fixes #5836
Fixes #5721

2 files changed, 10 insertions, 0 deletions

diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 578e5d0033..385accfa9d 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -125,6 +125,10 @@ std::array<uint16_t, 2> NativeMapView::getFramebufferSize() const {
 }
 
 void NativeMapView::activate() {
+    if (active++) {
+        return;
+    }
+
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::activate");
 
     oldDisplay = eglGetCurrentDisplay();
@@ -151,6 +155,10 @@ void NativeMapView::activate() {
 }
 
 void NativeMapView::deactivate() {
+    if (--active) {
+        return;
+    }
+
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::deactivate");
 
     assert(vm != nullptr);
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 9b5af76dfe..7974f282d9 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -97,6 +97,8 @@ private:
     std::unique_ptr<mbgl::DefaultFileSource> fileSource;
     std::unique_ptr<mbgl::Map> map;
     mbgl::EdgeInsets insets;
+
+    unsigned active = 0;
 };
 }
 }