Simplify mechanism to pass input args to Android app

Author: tustanivsky

integration-test/Integration.Tests.Android.ps1

@@ -244,7 +244,8 @@ BeforeAll {
     # TODO: Re-enable once Android SDK tag persistence is fixed (`test.crash_id` tag set before crash is not synced to the captured crash on Android)
 
     # Write-Host "Running crash-capture test (will crash)..." -ForegroundColor Yellow
-    # $global:AndroidCrashResult = Invoke-AndroidApp -ExecutablePath $script:ActivityName -Arguments "-e test crash-capture"
+    # $cmdlineCrashArgs = "-e cmdline '-crash-capture'"
+    # $global:AndroidCrashResult = Invoke-AndroidApp -ExecutablePath $script:ActivityName -Arguments $cmdlineCrashArgs
 
     # Write-Host "Crash test exit code: $($global:AndroidCrashResult.ExitCode)" -ForegroundColor Cyan
 
@@ -256,7 +257,8 @@ BeforeAll {
 
     Write-Host "Running message-capture test (will upload crash from previous run)..." -ForegroundColor Yellow
     # TODO: When AndroidProvider is added to app-runner: Invoke-DeviceApp $script:ActivityName -Arguments "-e test message-capture"
-    $global:AndroidMessageResult = Invoke-AndroidApp -ExecutablePath $script:ActivityName -Arguments "-e test message-capture"
+    $cmdlineMessageArgs = "-e cmdline '-message-capture'"
+    $global:AndroidMessageResult = Invoke-AndroidApp -ExecutablePath $script:ActivityName -Arguments $cmdlineMessageArgs
 
     Write-Host "Message test exit code: $($global:AndroidMessageResult.ExitCode)" -ForegroundColor Cyan
 }

sample/Source/SentryPlayground/SentryPlayground.Build.cs

@@ -20,12 +20,5 @@ public SentryPlayground(ReadOnlyTargetRules Target) : base(Target)
 		// PrivateDependencyModuleNames.Add("OnlineSubsystem");
 
 		// To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
-
-		// Register Android UPL for Intent extras handling (integration tests)
-		if (Target.Platform == UnrealTargetPlatform.Android)
-		{
-			string PluginPath = Utils.MakePathRelativeTo(ModuleDirectory, Target.RelativeEnginePath);
-			AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(PluginPath, "SentryPlayground_Android_UPL.xml"));
-		}
 	}
 }

sample/Source/SentryPlayground/SentryPlaygroundGameInstance.cpp

@@ -14,73 +14,13 @@
 #include "Misc/CommandLine.h"
 #include "Engine/Engine.h"
 
-#if PLATFORM_ANDROID
-#include "Android/AndroidJNI.h"
-#include "Android/AndroidApplication.h"
-
-// Helper function to get command-line arguments from Android Intent extras
-// Calls the AndroidThunkJava_GetIntentCommandLine() method added via UPL
-FString GetIntentCommandLineFromAndroid()
-{
-	FString Result;
-
-	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
-	{
-		// Get GameActivity class
-		jclass GameActivityClass = FAndroidApplication::FindJavaClass("com/epicgames/unreal/GameActivity");
-		if (GameActivityClass != nullptr)
-		{
-			// Find our custom method: AndroidThunkJava_GetIntentCommandLine()
-			jmethodID GetIntentCmdLineMethod = Env->GetMethodID(
-				GameActivityClass,
-				"AndroidThunkJava_GetIntentCommandLine",
-				"()Ljava/lang/String;"
-			);
-
-			if (GetIntentCmdLineMethod != nullptr)
-			{
-				// Get the GameActivity instance
-				jobject GameActivityObj = FAndroidApplication::GetGameActivityThis();
-				if (GameActivityObj != nullptr)
-				{
-					// Call the method
-					jstring JavaResult = (jstring)Env->CallObjectMethod(GameActivityObj, GetIntentCmdLineMethod);
-					if (JavaResult != nullptr)
-					{
-						// Convert Java string to FString
-						const char* JavaChars = Env->GetStringUTFChars(JavaResult, nullptr);
-						Result = FString(UTF8_TO_TCHAR(JavaChars));
-						Env->ReleaseStringUTFChars(JavaResult, JavaChars);
-						Env->DeleteLocalRef(JavaResult);
-					}
-				}
-			}
-
-			Env->DeleteLocalRef(GameActivityClass);
-		}
-	}
-
-	return Result;
-}
-#endif
-
 void USentryPlaygroundGameInstance::Init()
 {
 	Super::Init();
 
 	FString CommandLine = FCommandLine::Get();
 
-#if PLATFORM_ANDROID
-	// On Android, merge Intent extras into command line
-	// Intent extras are passed via: adb shell am start -n <package>/<activity> -e test crash-capture
-	FString IntentCommandLine = GetIntentCommandLineFromAndroid();
-	if (!IntentCommandLine.IsEmpty())
-	{
-		UE_LOG(LogSentrySample, Display, TEXT("[SentryPlayground] Intent command line: %s"), *IntentCommandLine);
-		// Prepend Intent args so they take precedence over default command line
-		CommandLine = IntentCommandLine + TEXT(" ") + CommandLine;
-	}
-#endif
+	UE_LOG(LogSentrySample, Display, TEXT("Startin app with commandline: %s\n"), *CommandLine);
 
 	// Check for expected test parameters to decide between running integration tests
 	// or launching the sample app with UI for manual testing