From fcf6a7ded1e42f740a9b8de03b885f32f9f35be2 Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Tue, 26 Apr 2022 22:41:11 +0300
Subject: [PATCH] [Android] Minor postInvalidateWindowSurface JNI cleanup

---
 .../app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java | 1 +
 src/xenia/ui/windowed_app_context_android.cc                     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java b/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java
index 073283529..e93baaf0e 100644
--- a/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java
+++ b/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java
@@ -85,6 +85,7 @@ public abstract class WindowedAppActivity extends Activity {
     }
 
     // Used from the native WindowedAppContext. May be called from non-UI threads.
+    @SuppressWarnings("UnusedDeclaration")
     protected void postInvalidateWindowSurface() {
         if (mWindowSurfaceView == null) {
             return;
diff --git a/src/xenia/ui/windowed_app_context_android.cc b/src/xenia/ui/windowed_app_context_android.cc
index 2deb4e95e..c7cdaa6db 100644
--- a/src/xenia/ui/windowed_app_context_android.cc
+++ b/src/xenia/ui/windowed_app_context_android.cc
@@ -336,6 +336,7 @@ void AndroidWindowedAppContext::Shutdown() {
     ui_thread_looper_ = nullptr;
   }
 
+  activity_method_post_invalidate_window_surface_ = nullptr;
   activity_method_finish_ = nullptr;
   if (activity_) {
     ui_thread_jni_env_->DeleteGlobalRef(activity_);