Merge remote-tracking branch 'origin/main' into feat/vite-bundler-improvements

Author: NathanWalker

.github/workflows/codeql-advanced.yml

@@ -60,7 +60,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
     # Add any setup steps before running the `github/codeql-action/init` action.
     # This includes steps like installing compilers or runtimes (`actions/setup-node`
@@ -70,7 +70,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+      uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -98,6 +98,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+      uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.3.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v4.3.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
+        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0

.github/workflows/npm_release_cli.yml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -115,7 +115,7 @@ jobs:
       NPM_TAG: ${{needs.build.outputs.npm_tag}}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
@@ -166,11 +166,11 @@ jobs:
       NPM_VERSION: ${{needs.build.outputs.npm_version}}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           ref: v${{needs.build.outputs.npm_version}}

.github/workflows/npm_release_doctor.yml

@@ -24,11 +24,11 @@ jobs:
     steps:
 
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Setup
         run: npm install

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
     steps:
 
       - name: "Checkout code"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.3.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v4.3.0
         with:
           persist-credentials: false
 
@@ -68,6 +68,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
         with:
           sarif_file: results.sarif

lib/common/mobile/android/android-emulator-services.ts

@@ -3,7 +3,7 @@ import { getCurrentEpochTime, sleep } from "../../helpers";
 import { EOL } from "os";
 import * as _ from "lodash";
 import { LoggerConfigData } from "../../../constants";
-import { IChildProcess, IUtils } from "../../declarations";
+import { IChildProcess, IUserSettingsService, IUtils } from "../../declarations";
 import { injector } from "../../yok";
 import * as semver from "semver";
 
@@ -18,6 +18,7 @@ export class AndroidEmulatorServices
 		private $emulatorHelper: Mobile.IEmulatorHelper,
 		private $logger: ILogger,
 		private $utils: IUtils,
+		private $userSettingsService: IUserSettingsService,
 	) {}
 
 	public async getEmulatorImages(): Promise<Mobile.IEmulatorImagesOutput> {
@@ -154,7 +155,7 @@ export class AndroidEmulatorServices
 			};
 		}
 
-		this.spawnEmulator(emulator);
+		await this.spawnEmulator(emulator);
 
 		const isInfiniteWait = this.$utils.getMilliSecondsTimeout(timeout) === 0;
 		let hasTimeLeft = getCurrentEpochTime() < endTimeEpoch;
@@ -186,7 +187,7 @@ export class AndroidEmulatorServices
 		}
 	}
 
-	private spawnEmulator(emulator: Mobile.IDeviceInfo): void {
+	private async spawnEmulator(emulator: Mobile.IDeviceInfo) {
 		let pathToEmulatorExecutable = null;
 		let startEmulatorArgs = null;
 		if (emulator.vendor === AndroidVirtualDevice.AVD_VENDOR_NAME) {
@@ -195,6 +196,12 @@ export class AndroidEmulatorServices
 			startEmulatorArgs = this.$androidVirtualDeviceService.startEmulatorArgs(
 				emulator.imageIdentifier,
 			);
+			try {
+				const additionalArgs = await this.$userSettingsService.getSettingValue<string[]>("androidEmulatorStartArgs");
+				if (additionalArgs?.length) {
+					startEmulatorArgs.push(...additionalArgs);
+				}
+			} catch (error) {}
 		} else if (
 			emulator.vendor === AndroidVirtualDevice.GENYMOTION_VENDOR_NAME
 		) {