Merge pull request #10054 from JosJuice/android-game-cache-lock

Android: Reduce gameFileCache lock contention

1 files changed, 9 insertions, 3 deletions

diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp
index 06329a70ac..b79d85db15 100644
--- a/Source/Android/jni/GameList/GameFileCache.cpp
+++ b/Source/Android/jni/GameList/GameFileCache.cpp
@@ -38,6 +38,13 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_finali
   delete GetPointer(env, obj);
 }
 
+JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_getAllGamePaths(
+    JNIEnv* env, jclass, jobjectArray folder_paths, jboolean recursive_scan)
+{
+  return VectorToJStringArray(
+      env, UICommon::FindAllGamePaths(JStringArrayToVector(env, folder_paths), recursive_scan));
+}
+
 JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_getSize(JNIEnv* env,
                                                                                   jobject obj)
 {
@@ -66,10 +73,9 @@ JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_add
 }
 
 JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_update(
-    JNIEnv* env, jobject obj, jobjectArray folder_paths, jboolean recursive_scan)
+    JNIEnv* env, jobject obj, jobjectArray game_paths)
 {
-  return GetPointer(env, obj)->Update(
-      UICommon::FindAllGamePaths(JStringArrayToVector(env, folder_paths), recursive_scan));
+  return GetPointer(env, obj)->Update(JStringArrayToVector(env, game_paths));
 }
 
 JNIEXPORT jboolean JNICALL