Merge pull request #11984 from JosJuice/android-analytics-host

Android: Declare host thread when generating analytics ID

1 files changed, 6 insertions, 0 deletions

diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 5741afb9d8..8724b8449e 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -531,12 +531,18 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(J
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReportStartToAnalytics(JNIEnv*,
                                                                                            jclass)
 {
+  // Identity generation ends up calling config code, and some config callbacks use RunAsCPUThread
+  HostThreadLock guard;
+
   DolphinAnalytics::Instance().ReportDolphinStart(GetAnalyticValue("DEVICE_TYPE"));
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GenerateNewStatisticsId(JNIEnv*,
                                                                                             jclass)
 {
+  // Identity generation ends up calling config code, and some config callbacks use RunAsCPUThread
+  HostThreadLock guard;
+
   DolphinAnalytics::Instance().GenerateNewIdentity();
 }