diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2017-10-17 10:12:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 10:12:56 +0200 |
| commit | 774fca4d019b788089f4a0d456e9c0ee12d9e214 (patch) | |
| tree | b7cb2a1de1f4fce5ca4490ff6c666ae824e2c158 /Source/Android/jni/MainAndroid.cpp | |
| parent | 2dfbf866fb7ea70cf23f402b5106f5b38324a8e1 (diff) | |
| parent | 0d785452554df0158376a2de8b5b81bcf8af3939 (diff) | |
Merge pull request #6107 from hackbar/cleanup
Android UI: lots of cleanups, mainly around how Fragments are handled
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 35c81cc305..3e128997b4 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -58,7 +58,6 @@ std::string s_set_userpath; jclass s_jni_class; jmethodID s_jni_method_alert; -jmethodID s_jni_method_end; // The Core only supports using a single Host thread. // If multiple threads want to call host functions then they need to queue @@ -732,7 +731,6 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_CacheClassesAndMethods(JNIEnv* env, // Source/Android/app/build/intermediates/classes/arm/debug/org/dolphinemu/dolphinemu/NativeLibrary.class s_jni_method_alert = env->GetStaticMethodID(s_jni_class, "displayAlertMsg", "(Ljava/lang/String;)V"); - s_jni_method_end = env->GetStaticMethodID(s_jni_class, "endEmulationActivity", "()V"); } // Surface Handling @@ -816,9 +814,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* ANativeWindow_release(s_surf); s_surf = nullptr; } - - // Execute the Java method. - env->CallStaticVoidMethod(s_jni_class, s_jni_method_end); } #ifdef __cplusplus |