From 5e37b88833a4f2dc22f3c0e9da502c22806631f0 Mon Sep 17 00:00:00 2001
From: Tobrun Van Nuland <tobrun.van.nuland@gmail.com>
Date: Mon, 9 Oct 2017 16:38:01 +0200
Subject: [android] - remove obsolete terminate context/display calls

---
 .../main/java/com/mapbox/mapboxsdk/maps/MapView.java   |  3 ---
 .../java/com/mapbox/mapboxsdk/maps/NativeMapView.java  | 18 ------------------
 platform/android/src/native_map_view.cpp               | 10 ----------
 platform/android/src/native_map_view.hpp               |  4 ----
 4 files changed, 35 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 9fa3126523..b109d6f09a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -261,9 +261,6 @@ public class MapView extends FrameLayout {
   @UiThread
   public void onDestroy() {
     destroyed = true;
-    nativeMapView.terminateContext();
-    nativeMapView.terminateDisplay();
-    nativeMapView.destroySurface();
     mapCallback.clearOnMapReadyCallbacks();
     nativeMapView.destroy();
     nativeMapView = null;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index af3b57151d..eb92da2a3a 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -130,13 +130,6 @@ final class NativeMapView {
     nativeInitializeDisplay();
   }
 
-  public void terminateDisplay() {
-    if (isDestroyedOn("terminateDisplay")) {
-      return;
-    }
-    nativeTerminateDisplay();
-  }
-
   public void initializeContext() {
     if (isDestroyedOn("initializeContext")) {
       return;
@@ -144,13 +137,6 @@ final class NativeMapView {
     nativeInitializeContext();
   }
 
-  public void terminateContext() {
-    if (isDestroyedOn("terminateContext")) {
-      return;
-    }
-    nativeTerminateContext();
-  }
-
   public void createSurface(Surface surface) {
     if (isDestroyedOn("createSurface")) {
       return;
@@ -952,12 +938,8 @@ final class NativeMapView {
 
   private native void nativeInitializeDisplay();
 
-  private native void nativeTerminateDisplay();
-
   private native void nativeInitializeContext();
 
-  private native void nativeTerminateContext();
-
   private native void nativeCreateSurface(Object surface);
 
   private native void nativeDestroySurface();
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 159ba70508..0c4f612687 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -261,18 +261,10 @@ void NativeMapView::initializeDisplay(jni::JNIEnv&) {
     _initializeDisplay();
 }
 
-void NativeMapView::terminateDisplay(jni::JNIEnv&) {
-    _terminateDisplay();
-}
-
 void NativeMapView::initializeContext(jni::JNIEnv&) {
     _initializeContext();
 }
 
-void NativeMapView::terminateContext(jni::JNIEnv&) {
-    _terminateContext();
-}
-
 void NativeMapView::createSurface(jni::JNIEnv& env, jni::Object<> _surface) {
     _createSurface(ANativeWindow_fromSurface(&env, jni::Unwrap(*_surface)));
 }
@@ -1471,9 +1463,7 @@ void NativeMapView::registerNative(jni::JNIEnv& env) {
             METHOD(&NativeMapView::resizeView, "nativeResizeView"),
             METHOD(&NativeMapView::resizeFramebuffer, "nativeResizeFramebuffer"),
             METHOD(&NativeMapView::initializeDisplay, "nativeInitializeDisplay"),
-            METHOD(&NativeMapView::terminateDisplay, "nativeTerminateDisplay"),
             METHOD(&NativeMapView::initializeContext, "nativeInitializeContext"),
-            METHOD(&NativeMapView::terminateContext, "nativeTerminateContext"),
             METHOD(&NativeMapView::createSurface, "nativeCreateSurface"),
             METHOD(&NativeMapView::destroySurface, "nativeDestroySurface"),
             METHOD(&NativeMapView::getStyleUrl, "nativeGetStyleUrl"),
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index c638de44fb..d78fffb70a 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -95,12 +95,8 @@ public:
 
     void initializeDisplay(jni::JNIEnv&);
 
-    void terminateDisplay(jni::JNIEnv&);
-
     void initializeContext(jni::JNIEnv&);
 
-    void terminateContext(jni::JNIEnv&);
-
     void createSurface(jni::JNIEnv&, jni::Object<>);
 
     void destroySurface(jni::JNIEnv&);
-- 
cgit v1.2.1