diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index 3862fbecf..a406e83c0 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -661,15 +661,6 @@ void JNICALL nativeStopRotating(JNIEnv* env, jobject obj, jlong native_map_view_ COFFEE_TRY_JNI(env, native_map_view->getMap().stopRotating()); } -jboolean JNICALL nativeCanRotate(JNIEnv* env, jobject obj, jlong native_map_view_ptr) { - mbgl::Log::Debug(mbgl::Event::JNI, "nativeCanRotate"); - assert(native_map_view_ptr != 0); - NativeMapView* native_map_view = reinterpret_cast(native_map_view_ptr); - jboolean ret = false; - COFFEE_TRY_JNI(env, ret = native_map_view->getMap().canRotate()); - return ret; -} - void JNICALL nativeSetDebug(JNIEnv* env, jobject obj, jlong native_map_view_ptr, jboolean debug) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeSetDebug"); assert(native_map_view_ptr != 0); @@ -825,7 +816,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { } // NOTE: if you get java.lang.UnsatisfiedLinkError you likely forgot to set the size of the array correctly (too large) - std::array methods = {{ // Can remove the extra brace in C++14 + std::array methods = {{ // Can remove the extra brace in C++14 { "nativeCreate", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J", reinterpret_cast(&nativeCreate) }, { "nativeDestroy", "(J)V", reinterpret_cast(&nativeDestroy) }, { "nativeInitializeDisplay", "(J)V", reinterpret_cast(&nativeInitializeDisplay) }, @@ -882,7 +873,6 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { { "nativeResetNorth", "(J)V", reinterpret_cast(&nativeResetNorth) }, { "nativeStartRotating", "(J)V", reinterpret_cast(&nativeStartRotating) }, { "nativeStopRotating", "(J)V", reinterpret_cast(&nativeStopRotating) }, - { "nativeCanRotate", "(J)Z", reinterpret_cast(&nativeCanRotate) }, { "nativeSetDebug", "(JZ)V", reinterpret_cast(&nativeSetDebug) }, { "nativeToggleDebug", "(J)V", reinterpret_cast(&nativeToggleDebug) }, { "nativeGetDebug", "(J)Z", reinterpret_cast(&nativeGetDebug) }, diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java index 760a80200..bdea6f7e3 100644 --- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java +++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java @@ -366,10 +366,6 @@ class NativeMapView { nativeStopRotating(mNativeMapViewPtr); } - public boolean canRotate() { - return nativeCanRotate(mNativeMapViewPtr); - } - public void setDebug(boolean debug) { nativeSetDebug(mNativeMapViewPtr, debug); } @@ -533,8 +529,6 @@ class NativeMapView { private native void nativeStopRotating(long nativeMapViewPtr); - private native boolean nativeCanRotate(long nativeMapViewPtr); - private native void nativeSetDebug(long nativeMapViewPtr, boolean debug); private native void nativeToggleDebug(long nativeMapViewPtr);