diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2015-04-16 16:24:39 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-04-17 13:40:42 +0200 |
commit | 6691f7249e8aa4df4aa65712dc768e8b6a5e8dc1 (patch) | |
tree | 3a084fe8c6ad739414c4331219f4138f7b6c3b5a /android | |
parent | 1c920c433274095af37a3da89207e9ea03df64ae (diff) | |
download | qtlocation-mapboxgl-6691f7249e8aa4df4aa65712dc768e8b6a5e8dc1.tar.gz |
remove nativeRun() method as that is now private
Diffstat (limited to 'android')
-rw-r--r-- | android/cpp/jni.cpp | 10 | ||||
-rw-r--r-- | android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index b6e46ed5ac..628f24a15b 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -283,13 +283,6 @@ void JNICALL nativeResume(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) { nativeMapView->resume(); } -void JNICALL nativeRun(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) { - mbgl::Log::Debug(mbgl::Event::JNI, "nativeRun"); - assert(nativeMapViewPtr != 0); - NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr); - nativeMapView->getMap().run(); -} - void JNICALL nativeUpdate(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeUpdate"); assert(nativeMapViewPtr != 0); @@ -936,7 +929,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<JNINativeMethod, 63> methods = {{ // Can remove the extra brace in C++14 + std::array<JNINativeMethod, 62> methods = {{ // Can remove the extra brace in C++14 {"nativeCreate", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J", reinterpret_cast<void *>(&nativeCreate)}, {"nativeDestroy", "(J)V", reinterpret_cast<void *>(&nativeDestroy)}, @@ -951,7 +944,6 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { {"nativeStop", "(J)V", reinterpret_cast<void *>(&nativeStop)}, {"nativePause", "(J)V", reinterpret_cast<void *>(&nativePause)}, {"nativeResume", "(J)V", reinterpret_cast<void *>(&nativeResume)}, - {"nativeRun", "(J)V", reinterpret_cast<void *>(&nativeRun)}, {"nativeUpdate", "(J)V", reinterpret_cast<void *>(&nativeUpdate)}, {"nativeTerminate", "(J)V", reinterpret_cast<void *>(&nativeTerminate)}, {"nativeResize", "(JIIFII)V", diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java index d7ca950fbf..4dcd5ef8ed 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java @@ -89,10 +89,6 @@ class NativeMapView { nativeResume(mNativeMapViewPtr); } - public void run() { - nativeRun(mNativeMapViewPtr); - } - public void update() { nativeUpdate(mNativeMapViewPtr); } @@ -398,8 +394,6 @@ class NativeMapView { private native void nativeResume(long nativeMapViewPtr); - private native void nativeRun(long nativeMapViewPtr); - private native void nativeUpdate(long nativeMapViewPtr); private native void nativeTerminate(long nativeMapViewPtr); |