fix: launch android settings by component

Author: DjDeveloperr

.github/workflows/ci.yml

@@ -490,9 +490,10 @@ jobs:
           $env:SIMDECK_INTEGRATION_REQUIRE_RUNNING_ANDROID = "1"
           $env:SIMDECK_INTEGRATION_VERBOSE = "1"
           npm run test:integration:android
-          if ($LASTEXITCODE -ne 0) {
+          $testExitCode = $LASTEXITCODE
+          if ($testExitCode -ne 0) {
             Write-EmulatorDiagnostics
-            throw "Android integration tests failed with exit code $LASTEXITCODE."
+            throw "Android integration tests failed with exit code $testExitCode."
           }
 
       - name: Stop Android emulator (Windows)

packages/server/src/android.rs

@@ -447,6 +447,10 @@ impl AndroidBridge {
 
     pub fn launch_package(&self, id: &str, package: &str) -> Result<(), AppError> {
         let serial = self.serial_for_id(id)?;
+        if is_android_component_name(package) {
+            self.run_adb(["-s", &serial, "shell", "am", "start", "-n", package])?;
+            return Ok(());
+        }
         self.run_adb([
             "-s",
             &serial,
@@ -1708,6 +1712,13 @@ fn parse_online_emulator_serials(output: &str) -> Vec<String> {
         .collect()
 }
 
+fn is_android_component_name(value: &str) -> bool {
+    value
+        .split_once('/')
+        .map(|(package, activity)| !package.is_empty() && !activity.is_empty())
+        .unwrap_or(false)
+}
+
 fn android_cmdline_tool_path(name: &str) -> PathBuf {
     let root = sdk_root();
     let latest = android_sdk_tool_path_for_os(
@@ -2634,6 +2645,17 @@ abcd1234\tdevice
 
         assert_eq!(parse_online_emulator_serials(output), vec!["emulator-5554"]);
     }
+
+    #[test]
+    fn android_component_names_require_package_and_activity() {
+        assert!(is_android_component_name("com.android.settings/.Settings"));
+        assert!(is_android_component_name(
+            "com.example/com.example.MainActivity"
+        ));
+        assert!(!is_android_component_name("com.example"));
+        assert!(!is_android_component_name("com.example/"));
+        assert!(!is_android_component_name("/.MainActivity"));
+    }
 }
 
 mod grpc {

scripts/github-actions.test.mjs

@@ -114,6 +114,7 @@ test("Android integration runner resolves Windows executables", () => {
     androidIntegration,
     /fallbackAvdName && avds\.size === 0 && devices\.length === 1/,
   );
+  assert.match(androidIntegration, /com\.android\.settings\/\.Settings/);
   assert.match(androidIntegration, /simdeck-bin\.exe/);
   assert.match(androidIntegration, /simdeck-bin-win32-x64\.exe/);
   assert.match(androidIntegration, /AppData", "Local", "Android", "Sdk/);

scripts/integration/android.mjs

@@ -16,6 +16,9 @@ const requireRunningAndroid =
   process.env.SIMDECK_INTEGRATION_REQUIRE_RUNNING_ANDROID === "1" ||
   process.env.CI === "true";
 const requestedAvd = process.env.SIMDECK_INTEGRATION_ANDROID_AVD;
+const androidLaunchTarget =
+  process.env.SIMDECK_INTEGRATION_ANDROID_LAUNCH_TARGET ??
+  "com.android.settings/.Settings";
 const defaultStepTimeoutMs = Number(
   process.env.SIMDECK_INTEGRATION_STEP_TIMEOUT_MS ?? "180000",
 );
@@ -213,7 +216,7 @@ async function runCliSurface() {
     }
   });
   await measuredStep("CLI app launch and URL", () => {
-    simdeckJson(["launch", androidUDID, "com.android.settings"], {
+    simdeckJson(["launch", androidUDID, androidLaunchTarget], {
       timeoutMs: 60_000,
     });
     simdeckJson(["open-url", androidUDID, "https://example.com"], {
@@ -355,7 +358,7 @@ async function runJsSurface() {
     }
   });
   await measuredStep("JS app launch and URL", async () => {
-    await session.launch(androidUDID, "com.android.settings");
+    await session.launch(androidUDID, androidLaunchTarget);
     await session.openUrl(androidUDID, "https://example.com");
     await session.home(androidUDID);
   });