Make logging work in these callbacks, and clarify the future solution

Common/File/AndroidStorage.cpp

@@ -69,6 +69,8 @@ bool Android_IsContentUri(std::string_view filename) {
 
 int Android_OpenContentUriFd(std::string_view filename, Android_OpenContentUriMode mode) {
 	if (!g_nativeActivity) {
+		// Hit this in shortcut creation.
+		ERROR_LOG(Log::IO, "Android_OpenContentUriFd: No native activity");
 		return -1;
 	}
 

Common/Log/LogManager.h

@@ -43,7 +43,7 @@ struct LogMessage {
 };
 
 enum class LogOutput {
-	Stdio = (1 << 0),
+	Stdio = (1 << 0),  // Also android log.
 	DebugString = (1 << 1),
 	RingBuffer = (1 << 2),
 	File = (1 << 3),

UI/GameInfoCache.cpp

@@ -895,7 +895,6 @@ private:
 };
 
 GameInfoCache::GameInfoCache() {
-	Init();
 }
 
 GameInfoCache::~GameInfoCache() {
@@ -903,8 +902,6 @@ GameInfoCache::~GameInfoCache() {
 	Shutdown();
 }
 
-void GameInfoCache::Init() {}
-
 void GameInfoCache::Shutdown() {
 	CancelAll();
 }

UI/GameInfoCache.h

@@ -201,7 +201,6 @@ public:
 	void CancelAll();
 
 private:
-	void Init();
 	void Shutdown();
 
 	// Maps ISO path to info. Need to use shared_ptr as we can return these pointers - 

android/jni/app-android.cpp

@@ -98,7 +98,6 @@ struct JNIEnv {};
 #include "Core/HLE/sceUsbCam.h"
 #include "Core/HLE/sceUsbGps.h"
 #include "Common/CPUDetect.h"
-#include "Common/Log.h"
 #include "UI/GameInfoCache.h"
 
 #include "app-android.h"
@@ -1703,13 +1702,17 @@ static void VulkanEmuThread(ANativeWindow *wnd) {
 
 // NOTE: This is defunct and not working, due to how the Android storage functions currently require
 // a PpssppActivity specifically and we don't have one here.
+// We need to make openContentUri and friends into static functions that take a jobject activity, and here
+// we need to feed the ShortcutActivity to them.
 extern "C" jstring Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameName(JNIEnv * env, jclass, jstring jpath) {
 	bool teardownThreadManager = false;
 	if (!g_threadManager.IsInitialized()) {
-		INFO_LOG(Log::System, "No thread manager - initializing one");
 		// Need a thread manager.
 		teardownThreadManager = true;
 		g_threadManager.Init(1, 1);
+		g_logManager.SetOutputsEnabled(LogOutput::Stdio);
+		g_logManager.SetAllLogLevels(LogLevel::LDEBUG);
+		INFO_LOG(Log::System, "No thread manager - initializing one");
 	}
 
 	Path path = Path(GetJavaString(env, jpath));
@@ -1746,6 +1749,7 @@ extern "C" jstring Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameName(JNIEnv
 	delete cache;
 
 	if (teardownThreadManager) {
+		g_logManager.SetOutputsEnabled((LogOutput)0);
 		g_threadManager.Teardown();
 	}
 
@@ -1758,10 +1762,12 @@ JNIEXPORT jbyteArray JNICALL
 Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameIcon(JNIEnv * env, jclass clazz, jstring jpath) {
 	bool teardownThreadManager = false;
 	if (!g_threadManager.IsInitialized()) {
-		INFO_LOG(Log::System, "No thread manager - initializing one");
 		// Need a thread manager.
 		teardownThreadManager = true;
 		g_threadManager.Init(1, 1);
+		g_logManager.SetOutputsEnabled(LogOutput::Stdio);
+		g_logManager.SetAllLogLevels(LogLevel::LDEBUG);
+		INFO_LOG(Log::System, "No thread manager - initializing one");
 	}
 	// TODO: implement requestIcon()
 
@@ -1801,7 +1807,8 @@ Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameIcon(JNIEnv * env, jclass clazz
     delete cache;
 
     if (teardownThreadManager) {
-        g_threadManager.Teardown();
+		g_logManager.SetOutputsEnabled((LogOutput)0);
+		g_threadManager.Teardown();
     }
 
     return result;