Skip to content

Commit a19acaf

Browse files
committed
fix(timeouts): limit deployment bounds to install-family adb calls
1 parent 6799e6b commit a19acaf

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎packages/platform-android/src/deployment/native.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ test('preserves missing-package uninstall and typed push extras', async () => {
136136
expect(run).toHaveBeenLastCalledWith(
137137
expect.objectContaining({
138138
args: expect.arrayContaining(['--es', 'title', 'Hello', '--ez', 'enabled', 'true']),
139+
timeoutMs: undefined,
139140
}),
140141
signal,
141142
);

‎packages/platform-android/src/deployment/native.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ export async function uninstallAndroidPackage(
3939
packageName: string,
4040
signal: AbortSignal,
4141
): Promise<void> {
42-
const result = await runAdb(host, device, ['uninstall', packageName], signal);
42+
const result = await runAdb(
43+
host,
44+
device,
45+
['uninstall', packageName],
46+
signal,
47+
ANDROID_APP_DEPLOYMENT_ADB_TIMEOUT_MS,
48+
);
4349
if (result.exitCode === 0) return;
4450
const output = `${result.stdout}\n${result.stderr}`.toLowerCase();
4551
if (output.includes('unknown package') || output.includes('not installed')) return;
@@ -175,6 +181,7 @@ async function listInstalledPackages(
175181
device,
176182
deviceShellArgv('adb', 'shell', ['pm', 'list', 'packages']),
177183
signal,
184+
ANDROID_APP_DEPLOYMENT_ADB_TIMEOUT_MS,
178185
);
179186
assertCommandSuccess(result, 'adb package inventory failed');
180187
return new Set(
@@ -203,7 +210,7 @@ async function runAdb(
203210
device: DeviceInfo,
204211
args: readonly string[],
205212
signal: AbortSignal,
206-
timeoutMs = ANDROID_APP_DEPLOYMENT_ADB_TIMEOUT_MS,
213+
timeoutMs?: number,
207214
) {
208215
return await host.androidTools.runAdb(device, args, { timeoutMs, allowFailure: true }, signal);
209216
}

0 commit comments

Comments
 (0)