Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

fix(android): gate Android.devices() behind denyLaunch (#40535)

Pavel Feldman22c6d3754d66
diff --git a/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts b/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts
index f2a538fb55..1b2d7a1587 100644
--- a/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts
@@ -27,11 +27,15 @@ import type { Progress } from '@protocol/progress';
export class AndroidDispatcher extends Dispatcher<Android, channels.AndroidChannel, RootDispatcher> implements channels.AndroidChannel {
_type_Android = true;
- constructor(scope: RootDispatcher, android: Android) {
+ private readonly _denyLaunch: boolean;
+ constructor(scope: RootDispatcher, android: Android, denyLaunch: boolean) {
super(scope, android, 'Android', {});
+ this._denyLaunch = denyLaunch;
}
async devices(params: channels.AndroidDevicesParams, progress: Progress): Promise<channels.AndroidDevicesResult> {
+ if (this._denyLaunch)
+ throw new Error(`Connecting to Android devices is not allowed.`);
const devices = await this._object.devices(progress, params);
return {
devices: devices.map(d => AndroidDeviceDispatcher.from(this, d))
diff --git a/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts b/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts
index 09b7f0ad90..cc17b53934 100644
--- a/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts
@@ -52,7 +52,7 @@ export class PlaywrightDispatcher extends Dispatcher<Playwright, channels.Playwr
const chromium = new BrowserTypeDispatcher(scope, playwright.chromium, denyLaunch);
const firefox = new BrowserTypeDispatcher(scope, playwright.firefox, denyLaunch);
const webkit = new BrowserTypeDispatcher(scope, playwright.webkit, denyLaunch);
- const android = new AndroidDispatcher(scope, playwright.android);
+ const android = new AndroidDispatcher(scope, playwright.android, denyLaunch);
const initializer: channels.PlaywrightInitializer = {
chromium,
firefox,