appium-uiautomator2-driver 7.3.0 → 7.5.0

package/build/lib/driver.d.ts

@@ -1,12 +1,15 @@
 import type { DriverData, ExternalDriver, InitialOpts, RouteMatcher, SingularSessionData, StringRecord, SessionCapabilities } from '@appium/types';
+import { type ADB } from 'appium-adb';
 import { AndroidDriver } from 'appium-android-driver';
 import { mjpeg } from 'appium/support';
 import { type Uiautomator2Constraints } from './constraints';
-import type { Uiautomator2Settings, Uiautomator2DeviceDetails, Uiautomator2DriverCaps, Uiautomator2DriverOpts, Uiautomator2SessionCaps, Uiautomator2StartSessionOpts, W3CUiautomator2DriverCaps } from './types';
-import { UiAutomator2Server } from './uiautomator2';
+import type { Uiautomator2Settings, Uiautomator2DeviceDetails, Uiautomator2DriverCaps, Uiautomator2DriverOpts, W3CUiautomator2DriverCaps } from './types';
+import type { UiAutomator2Server } from './uiautomator2-server';
+import { allocateMjpegServerPort, allocateSystemPort, initServer, performExecution, performPostExecSetup, performPreExecSetup, releaseMjpegServerPort, releaseSystemPort, requireServer, startSession } from './uiautomator2-server';
 import { mobileGetActionHistory, mobileScheduleAction, mobileUnscheduleAction, releaseActions } from './commands/actions';
 import { getAlertText, mobileAcceptAlert, mobileDismissAlert, postAcceptAlert, postDismissAlert } from './commands/alert';
 import { mobileInstallMultipleApks } from './commands/app-management';
+import { checkAppPresent, ensureAppStarts, initAUT, prepareSessionApp } from './commands/aut';
 import { mobileGetBatteryInfo } from './commands/battery';
 import { getClipboard, setClipboard } from './commands/clipboard';
 import { active, getElementRect, getElementScreenshot, clear, mobileReplaceElementValue } from './commands/element';
@@ -1047,25 +1050,27 @@ declare class AndroidUiautomator2Driver extends AndroidDriver implements Externa
     getWindowRect: AndroidDriver["getWindowRect"];
     getWindowSize: AndroidDriver["getWindowSize"];
     mobileViewPortRect: typeof mobileViewPortRect;
+    prepareSessionApp: typeof prepareSessionApp;
+    checkAppPresent: typeof checkAppPresent;
+    initAUT: typeof initAUT;
+    ensureAppStarts: typeof ensureAppStarts;
+    allocateSystemPort: typeof allocateSystemPort;
+    releaseSystemPort: typeof releaseSystemPort;
+    allocateMjpegServerPort: typeof allocateMjpegServerPort;
+    releaseMjpegServerPort: typeof releaseMjpegServerPort;
+    performSessionPreExecSetup: typeof performPreExecSetup;
+    performSessionExecution: typeof performExecution;
+    performSessionPostExecSetup: typeof performPostExecSetup;
+    startUiAutomator2Session: typeof startSession;
+    initUiAutomator2Server: typeof initServer;
+    requireUiautomator2: typeof requireServer;
     constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
     get driverData(): {};
     validateDesiredCaps(caps: any): caps is Uiautomator2DriverCaps;
     createSession(w3cCaps1: W3CUiautomator2DriverCaps, w3cCaps2?: W3CUiautomator2DriverCaps, w3cCaps3?: W3CUiautomator2DriverCaps, driverData?: DriverData[]): Promise<any>;
     getDeviceDetails(): Promise<Uiautomator2DeviceDetails>;
     getSession(): Promise<SingularSessionData<Uiautomator2Constraints>>;
-    allocateSystemPort(): Promise<void>;
-    releaseSystemPort(): Promise<void>;
-    allocateMjpegServerPort(): Promise<void>;
-    releaseMjpegServerPort(): Promise<void>;
-    performSessionPreExecSetup(): Promise<StringRecord | undefined>;
-    performSessionExecution(capsWithSessionInfo: StringRecord): Promise<void>;
-    performSessionPostExecSetup(): Promise<void>;
-    startUiAutomator2Session(caps: Uiautomator2StartSessionOpts): Promise<Uiautomator2SessionCaps>;
-    initUiAutomator2Server(): Promise<UiAutomator2Server>;
-    initAUT(): Promise<void>;
-    ensureAppStarts(): Promise<void>;
     deleteSession(): Promise<void>;
-    checkAppPresent(): Promise<void>;
     onSettingsUpdate(): Promise<void>;
     proxyActive(sessionId: string): boolean;
     canProxy(sessionId: string): boolean;
@@ -1073,8 +1078,7 @@ declare class AndroidUiautomator2Driver extends AndroidDriver implements Externa
     updateSettings(settings: Uiautomator2Settings): Promise<void>;
     getSettings(): Promise<StringRecord>;
     getAppiumSessionCapabilities(): Promise<SessionCapabilities<Uiautomator2Constraints>>;
-    private requireAdb;
-    private requireUiautomator2;
+    requireAdb(): ADB;
 }
 export { AndroidUiautomator2Driver };
 //# sourceMappingURL=driver.d.ts.map

package/build/lib/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}

package/build/lib/driver.js

@@ -6,22 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidUiautomator2Driver = void 0;
 const appium_adb_1 = require("appium-adb");
 const appium_android_driver_1 = require("appium-android-driver");
-const io_appium_settings_1 = require("io.appium.settings");
 const driver_1 = require("appium/driver");
 const support_1 = require("appium/support");
-const asyncbox_1 = require("asyncbox");
-const lodash_1 = __importDefault(require("lodash"));
-const node_os_1 = __importDefault(require("node:os"));
-const node_path_1 = __importDefault(require("node:path"));
-const portscanner_1 = require("portscanner");
 const constraints_1 = __importDefault(require("./constraints"));
-const extensions_1 = require("./extensions");
 const method_map_1 = require("./method-map");
-const helpers_1 = require("./helpers");
-const uiautomator2_1 = require("./uiautomator2");
+const utils_1 = require("./utils");
+const uiautomator2_server_1 = require("./uiautomator2-server");
 const actions_1 = require("./commands/actions");
 const alert_1 = require("./commands/alert");
 const app_management_1 = require("./commands/app-management");
+const aut_1 = require("./commands/aut");
 const battery_1 = require("./commands/battery");
 const clipboard_1 = require("./commands/clipboard");
 const element_1 = require("./commands/element");
@@ -34,21 +28,6 @@ const navigation_1 = require("./commands/navigation");
 const screenshot_1 = require("./commands/screenshot");
 const viewport_1 = require("./commands/viewport");
 const execute_method_map_1 = require("./execute-method-map");
-// The range of ports we can use on the system for communicating to the
-// UiAutomator2 HTTP server on the device
-const DEVICE_PORT_RANGE = [8200, 8299];
-// The guard is needed to avoid dynamic system port allocation conflicts for
-// parallel driver sessions
-const DEVICE_PORT_ALLOCATION_GUARD = support_1.util.getLockFileGuard(node_path_1.default.resolve(node_os_1.default.tmpdir(), 'uia2_device_port_guard'), { timeout: 25, tryRecovery: true });
-// This is the port that UiAutomator2 listens to on the device. We will forward
-// one of the ports above on the system to this port on the device.
-const DEVICE_PORT = 6790;
-// This is the port that the UiAutomator2 MJPEG server listens to on the device.
-// We will forward one of the ports above on the system to this port on the
-// device.
-const MJPEG_SERVER_DEVICE_PORT = 7810;
-const MIN_SUPPORTED_API_LEVEL = 26;
-const LOCALHOST_IP4 = '127.0.0.1';
 // NO_PROXY contains the paths that we never want to proxy to UiAutomator2 server.
 // TODO:  Add the list of paths that we never want to proxy to UiAutomator2 server.
 // TODO: Need to segregate the paths better way using regular expressions wherever applicable.
@@ -222,6 +201,20 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
     getWindowRect = viewport_1.getWindowRect;
     getWindowSize = viewport_1.getWindowSize;
     mobileViewPortRect = viewport_1.mobileViewPortRect;
+    prepareSessionApp = aut_1.prepareSessionApp;
+    checkAppPresent = aut_1.checkAppPresent;
+    initAUT = aut_1.initAUT;
+    ensureAppStarts = aut_1.ensureAppStarts;
+    allocateSystemPort = uiautomator2_server_1.allocateSystemPort;
+    releaseSystemPort = uiautomator2_server_1.releaseSystemPort;
+    allocateMjpegServerPort = uiautomator2_server_1.allocateMjpegServerPort;
+    releaseMjpegServerPort = uiautomator2_server_1.releaseMjpegServerPort;
+    performSessionPreExecSetup = uiautomator2_server_1.performPreExecSetup;
+    performSessionExecution = uiautomator2_server_1.performExecution;
+    performSessionPostExecSetup = uiautomator2_server_1.performPostExecSetup;
+    startUiAutomator2Session = uiautomator2_server_1.startSession;
+    initUiAutomator2Server = uiautomator2_server_1.initServer;
+    requireUiautomator2 = uiautomator2_server_1.requireServer;
     constructor(opts = {}, shouldValidateCaps = true) {
         // `shell` overwrites adb.shell, so remove
         // @ts-expect-error FIXME: what is this?
@@ -235,7 +228,7 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
             'css selector',
             '-android uiautomator',
         ];
-        this.desiredCapConstraints = lodash_1.default.cloneDeep(constraints_1.default);
+        this.desiredCapConstraints = structuredClone(constraints_1.default);
         this.jwpProxyActive = false;
         this.jwpProxyAvoid = NO_PROXY;
         this._originalIme = null;
@@ -245,8 +238,8 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
         this.caps = {};
         this.opts = opts;
         // memoize functions here, so that they are done on a per-instance basis
-        this.getStatusBarHeight = lodash_1.default.memoize(this.getStatusBarHeight);
-        this.getDevicePixelRatio = lodash_1.default.memoize(this.getDevicePixelRatio);
+        this.getStatusBarHeight = (0, utils_1.memoize)(this.getStatusBarHeight);
+        this.getDevicePixelRatio = (0, utils_1.memoize)(this.getDevicePixelRatio);
     }
     get driverData() {
         // TODO fill out resource info here
@@ -277,7 +270,7 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
                 adbPort: appium_adb_1.DEFAULT_ADB_PORT,
                 androidInstallTimeout: 90000,
             };
-            lodash_1.default.defaults(this.opts, defaultOpts);
+            (0, utils_1.assignDefaults)(this.opts, defaultOpts);
             this.opts.adbPort = this.opts.adbPort || appium_adb_1.DEFAULT_ADB_PORT;
             // get device udid for this session
             const { udid, emPort } = await this.getDeviceInfoFromCaps();
@@ -301,23 +294,7 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
                 this.opts.appActivity = this.caps.appActivity = activity;
                 this.log.info(`Chrome-type package and activity are ${pkg} and ${activity}`);
             }
-            if (this.opts.app) {
-                // find and copy, or download and unzip an app url or path
-                this.opts.app = await this.helpers.configureApp(this.opts.app, [
-                    extensions_1.APK_EXTENSION,
-                    extensions_1.APKS_EXTENSION,
-                ]);
-                await this.checkAppPresent();
-            }
-            else if (this.opts.appPackage) {
-                // the app isn't an actual app file but rather something we want to
-                // assume is on the device and just launch via the appPackage
-                this.log.info(`Starting '${this.opts.appPackage}' directly on the device`);
-            }
-            else {
-                this.log.info(`Neither 'app' nor 'appPackage' was set. Starting UiAutomator2 ` +
-                    'without the target application');
-            }
+            await this.prepareSessionApp();
             const result = await this.startUiAutomator2Session(startSessionOpts);
             if (this.opts.mjpegScreenshotUrl) {
                 this.log.info(`Starting MJPEG stream reading URL: '${this.opts.mjpegScreenshotUrl}'`);
@@ -342,7 +319,7 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
             pixelRatio,
             statBarHeight,
             viewportRect,
-            deviceApiLevel: lodash_1.default.parseInt(apiVersion),
+            deviceApiLevel: Number.parseInt(String(apiVersion), 10),
             platformVersion,
             deviceManufacturer: manufacturer,
             deviceModel: model,
@@ -356,341 +333,11 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
         const uia2Data = (await this.requireUiautomator2().jwproxy.command('/', 'GET', {}));
         return { ...sessionData, ...uia2Data };
     }
-    async allocateSystemPort() {
-        const adb = this.requireAdb();
-        const forwardPort = async (localPort) => {
-            this.log.debug(`Forwarding UiAutomator2 Server port ${DEVICE_PORT} to local port ${localPort}`);
-            if ((await (0, portscanner_1.checkPortStatus)(localPort, LOCALHOST_IP4)) === 'open') {
-                throw this.log.errorWithException(`UiAutomator2 Server cannot start because the local port #${localPort} is busy. ` +
-                    `Make sure the port you provide via 'systemPort' capability is not occupied. ` +
-                    `This situation might often be a result of an inaccurate sessions management, e.g. ` +
-                    `old automation sessions on the same device must always be closed before starting new ones.`);
-            }
-            await adb.forwardPort(localPort, DEVICE_PORT);
-        };
-        if (this.opts.systemPort) {
-            this.systemPort = this.opts.systemPort;
-            return await forwardPort(this.systemPort);
-        }
-        await DEVICE_PORT_ALLOCATION_GUARD(async () => {
-            const [startPort, endPort] = DEVICE_PORT_RANGE;
-            try {
-                this.systemPort = await (0, portscanner_1.findAPortNotInUse)(startPort, endPort);
-            }
-            catch {
-                throw this.log.errorWithException(`Cannot find any free port in range ${startPort}..${endPort}}. ` +
-                    `Please set the available port number by providing the systemPort capability or ` +
-                    `double check the processes that are locking ports within this range and terminate ` +
-                    `these which are not needed anymore`);
-            }
-            await forwardPort(this.systemPort);
-        });
-    }
-    async releaseSystemPort() {
-        const adb = this.adb;
-        const systemPort = this.systemPort;
-        if (!systemPort || !adb) {
-            return;
-        }
-        if (this.opts.systemPort) {
-            // We assume if the systemPort is provided manually then it must be unique,
-            // so there is no need for the explicit synchronization
-            await adb.removePortForward(systemPort);
-        }
-        else {
-            await DEVICE_PORT_ALLOCATION_GUARD(async () => await adb.removePortForward(systemPort));
-        }
-    }
-    async allocateMjpegServerPort() {
-        if (this.opts.mjpegServerPort) {
-            const adb = this.requireAdb();
-            this.log.debug(`MJPEG broadcasting requested, forwarding MJPEG server port ${MJPEG_SERVER_DEVICE_PORT} ` +
-                `to local port ${this.opts.mjpegServerPort}`);
-            await adb.forwardPort(this.opts.mjpegServerPort, MJPEG_SERVER_DEVICE_PORT);
-        }
-    }
-    async releaseMjpegServerPort() {
-        if (this.opts.mjpegServerPort && this.adb) {
-            await this.adb.removePortForward(this.opts.mjpegServerPort);
-        }
-    }
-    async performSessionPreExecSetup() {
-        const apiLevel = await this.adb.getApiLevel();
-        if (apiLevel < MIN_SUPPORTED_API_LEVEL) {
-            throw this.log.errorWithException('UIAutomator2 only supports Android 8.0 (Oreo) and above');
-        }
-        const preflightPromises = [];
-        if (apiLevel >= 28) {
-            // Android P
-            preflightPromises.push((async () => {
-                this.log.info('Relaxing hidden api policy');
-                try {
-                    await this.adb.setHiddenApiPolicy('1', !!this.opts.ignoreHiddenApiPolicyError);
-                }
-                catch (err) {
-                    throw this.log.errorWithException('Hidden API policy (https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces) cannot be enabled. ' +
-                        'This might be happening because the device under test is not configured properly. ' +
-                        'Please check https://github.com/appium/appium/issues/13802 for more details. ' +
-                        'You could also set the "appium:ignoreHiddenApiPolicyError" capability to true in order to ' +
-                        'ignore this error, which might later lead to unexpected crashes or behavior of ' +
-                        `the automation server. Original error: ${err.message}`);
-                }
-            })());
-        }
-        if (support_1.util.hasValue(this.opts.gpsEnabled)) {
-            preflightPromises.push((async () => {
-                this.log.info(`Trying to ${this.opts.gpsEnabled ? 'enable' : 'disable'} gps location provider`);
-                await this.adb.toggleGPSLocationProvider(Boolean(this.opts.gpsEnabled));
-            })());
-        }
-        if (this.opts.hideKeyboard) {
-            preflightPromises.push((async () => {
-                this._originalIme = await this.adb.defaultIME();
-            })());
-        }
-        let appInfo;
-        preflightPromises.push((async () => {
-            // get appPackage et al from manifest if necessary
-            appInfo = await this.getLaunchInfo();
-        })());
-        // start settings app, set the language/locale, start logcat etc...
-        preflightPromises.push(this.initDevice());
-        await Promise.all(preflightPromises);
-        this.opts = { ...this.opts, ...(appInfo ?? {}) };
-        return appInfo;
-    }
-    async performSessionExecution(capsWithSessionInfo) {
-        await Promise.all([
-            // Prepare the device by forwarding the UiAutomator2 port
-            // This call mutates this.systemPort if it is not set explicitly
-            this.allocateSystemPort(),
-            // Prepare the device by forwarding the UiAutomator2 MJPEG server port (if
-            // applicable)
-            this.allocateMjpegServerPort(),
-        ]);
-        const [uiautomator2] = await Promise.all([
-            // set up the modified UiAutomator2 server etc
-            this.initUiAutomator2Server(),
-            (async () => {
-                // Should be after installing io.appium.settings
-                if (this.opts.disableWindowAnimation && (await this.adb.getApiLevel()) < 26) {
-                    // API level 26 is Android 8.0.
-                    // Granting android.permission.SET_ANIMATION_SCALE is necessary to handle animations under API level 26
-                    // Read https://github.com/appium/appium/pull/11640#issuecomment-438260477
-                    // `--no-window-animation` works over Android 8 to disable all of animations
-                    if (await this.adb.isAnimationOn()) {
-                        this.log.info('Disabling animation via io.appium.settings');
-                        await this.settingsApp.setAnimationState(false);
-                        this._wasWindowAnimationDisabled = true;
-                    }
-                    else {
-                        this.log.info('Window animation is already disabled');
-                    }
-                }
-            })(),
-            // set up app under test
-            // prepare our actual AUT, get it on the device, etc...
-            this.initAUT(),
-        ]);
-        // launch UiAutomator2 and wait till its online and we have a session
-        await uiautomator2.startSession(capsWithSessionInfo);
-        // now that everything has started successfully, turn on proxying so all
-        // subsequent session requests go straight to/from uiautomator2
-        this.jwpProxyActive = true;
-    }
-    async performSessionPostExecSetup() {
-        // Unlock the device after the session is started.
-        if (!this.opts.skipUnlock) {
-            // unlock the device to prepare it for testing
-            await this.unlock();
-        }
-        else {
-            this.log.debug(`'skipUnlock' capability set, so skipping device unlock`);
-        }
-        if (this.isChromeSession) {
-            // start a chromedriver session
-            await this.startChromeSession();
-        }
-        else if (this.opts.autoLaunch && this.opts.appPackage) {
-            await this.ensureAppStarts();
-        }
-        // if the initial orientation is requested, set it
-        if (support_1.util.hasValue(this.opts.orientation)) {
-            this.log.debug(`Setting initial orientation to '${this.opts.orientation}'`);
-            await this.setOrientation(this.opts.orientation);
-        }
-        // if we want to immediately get into a webview, set our context
-        // appropriately
-        if (this.opts.autoWebview) {
-            const viewName = this.defaultWebviewName();
-            const timeout = this.opts.autoWebviewTimeout || 2000;
-            this.log.info(`Setting auto webview to context '${viewName}' with timeout ${timeout}ms`);
-            await (0, asyncbox_1.retryInterval)(timeout / 500, 500, this.setContext.bind(this), viewName);
-        }
-        // We would like to notify about the initial context setting
-        if ((await this.getCurrentContext()) === this.defaultContextName()) {
-            await this.notifyBiDiContextChange();
-        }
-    }
-    async startUiAutomator2Session(caps) {
-        const appInfo = await this.performSessionPreExecSetup();
-        // set actual device name, udid, platform version, screen size, screen density, model and manufacturer details
-        const deviceName = this.adb?.curDeviceId;
-        const deviceUDID = this.opts.udid;
-        if (!deviceName) {
-            throw this.log.errorWithException('Could not determine device name (ADB curDeviceId is empty)');
-        }
-        if (!deviceUDID) {
-            throw this.log.errorWithException('Device UDID is not set in session options');
-        }
-        const sessionInfo = {
-            deviceName,
-            deviceUDID,
-        };
-        const capsWithSessionInfo = {
-            ...caps,
-            ...sessionInfo,
-        };
-        // Adding AUT info in the capabilities if it does not exist in caps
-        if (appInfo) {
-            for (const capName of ['appPackage', 'appActivity']) {
-                if (!capsWithSessionInfo[capName] && appInfo[capName]) {
-                    capsWithSessionInfo[capName] = appInfo[capName];
-                }
-            }
-        }
-        await this.performSessionExecution(capsWithSessionInfo);
-        const deviceInfoPromise = (async () => {
-            try {
-                return await this.getDeviceDetails();
-            }
-            catch (e) {
-                this.log.warn(`Cannot fetch device details. Original error: ${e.message}`);
-                return {};
-            }
-        })();
-        await this.performSessionPostExecSetup();
-        return { ...capsWithSessionInfo, ...(await deviceInfoPromise) };
-    }
-    async initUiAutomator2Server() {
-        const uiautomator2Opts = {
-            host: this.opts.remoteAdbHost || LOCALHOST_IP4,
-            systemPort: this.systemPort,
-            adb: this.adb,
-            disableWindowAnimation: !!this.opts.disableWindowAnimation,
-            disableSuppressAccessibilityService: this.opts.disableSuppressAccessibilityService,
-            readTimeout: this.opts.uiautomator2ServerReadTimeout,
-            basePath: this.basePath,
-        };
-        // now that we have package and activity, we can create an instance of
-        // uiautomator2 with the appropriate options
-        this.uiautomator2 = new uiautomator2_1.UiAutomator2Server(this.log, uiautomator2Opts);
-        this.proxyReqRes = this.uiautomator2.proxyReqRes.bind(this.uiautomator2);
-        this.proxyCommand = this.uiautomator2.proxyCommand.bind(this.uiautomator2);
-        if (this.opts.skipServerInstallation) {
-            this.log.info(`'skipServerInstallation' is set. Skipping UIAutomator2 server installation.`);
-        }
-        else {
-            await this.uiautomator2.installServerApk(this.opts.uiautomator2ServerInstallTimeout);
-            try {
-                await this.requireAdb().addToDeviceIdleWhitelist(io_appium_settings_1.SETTINGS_HELPER_ID, uiautomator2_1.SERVER_PACKAGE_ID, uiautomator2_1.SERVER_TEST_PACKAGE_ID);
-            }
-            catch (e) {
-                const err = e;
-                this.log.warn(`Cannot add server packages to the Doze whitelist. Original error: ` +
-                    (err.stderr || err.message));
-            }
-        }
-        return this.uiautomator2;
-    }
-    async initAUT() {
-        // Uninstall any uninstallOtherPackages which were specified in caps
-        if (this.opts.uninstallOtherPackages) {
-            await this.uninstallOtherPackages(appium_android_driver_1.utils.parseArray(this.opts.uninstallOtherPackages), [
-                io_appium_settings_1.SETTINGS_HELPER_ID,
-                uiautomator2_1.SERVER_PACKAGE_ID,
-                uiautomator2_1.SERVER_TEST_PACKAGE_ID,
-            ]);
-        }
-        // Install any "otherApps" that were specified in caps
-        if (this.opts.otherApps) {
-            let otherApps;
-            try {
-                otherApps = appium_android_driver_1.utils.parseArray(this.opts.otherApps);
-            }
-            catch (e) {
-                throw this.log.errorWithException(`Could not parse "otherApps" capability: ${e.message}`);
-            }
-            otherApps = await Promise.all(otherApps.map((app) => this.helpers.configureApp(app, [extensions_1.APK_EXTENSION, extensions_1.APKS_EXTENSION])));
-            await this.installOtherApks(otherApps);
-        }
-        if (this.opts.app && this.opts.appPackage) {
-            const adb = this.requireAdb();
-            const appPackage = this.opts.appPackage;
-            if ((this.opts.noReset && !(await adb.isAppInstalled(appPackage))) || !this.opts.noReset) {
-                if (!this.opts.noSign &&
-                    !(await adb.checkApkCert(this.opts.app, appPackage, {
-                        requireDefaultCert: false,
-                    }))) {
-                    await (0, helpers_1.signApp)(adb, this.opts.app);
-                }
-                if (!this.opts.skipUninstall) {
-                    await adb.uninstallApk(appPackage);
-                }
-                await this.installAUT();
-            }
-            else {
-                this.log.debug('noReset has been requested and the app is already installed. Doing nothing');
-            }
-        }
-        else {
-            if (this.opts.fullReset) {
-                throw this.log.errorWithException('Full reset requires an app capability, use fastReset if app is not provided');
-            }
-            this.log.debug('No app capability. Assuming it is already on the device');
-            if (this.opts.fastReset && this.opts.appPackage) {
-                await this.resetAUT();
-            }
-        }
-    }
-    async ensureAppStarts() {
-        const adb = this.requireAdb();
-        const appPackage = this.opts.appPackage;
-        const appActivity = this.opts.appActivity;
-        if (!appPackage) {
-            throw this.log.errorWithException('appPackage capability is required to start the application');
-        }
-        // make sure we have an activity and package to wait for
-        const appWaitPackage = this.opts.appWaitPackage || appPackage;
-        const appWaitActivity = this.opts.appWaitActivity || appActivity;
-        this.log.info(`Starting '${appPackage}${appActivity ? '/' + appActivity : ''}` +
-            `and waiting for '${appWaitPackage}${appWaitActivity ? '/' + appWaitActivity : ''}'`);
-        if (this.opts.noReset && !this.opts.forceAppLaunch && (await adb.processExists(appPackage))) {
-            this.log.info(`'${appPackage}' is already running and noReset is enabled. ` +
-                `Set forceAppLaunch capability to true if the app must be forcefully restarted on session startup.`);
-            return;
-        }
-        await adb.startApp({
-            pkg: appPackage,
-            activity: appActivity,
-            action: this.opts.intentAction || 'android.intent.action.MAIN',
-            category: this.opts.intentCategory || 'android.intent.category.LAUNCHER',
-            flags: this.opts.intentFlags || '0x10200000', // FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
-            waitPkg: this.opts.appWaitPackage,
-            waitActivity: this.opts.appWaitActivity,
-            waitForLaunch: this.opts.appWaitForLaunch,
-            waitDuration: this.opts.appWaitDuration,
-            optionalIntentArguments: this.opts.optionalIntentArguments,
-            stopApp: this.opts.forceAppLaunch || !this.opts.dontStopAppOnReset,
-            retry: true,
-            user: this.opts.userProfile,
-        });
-    }
     async deleteSession() {
         this.log.debug('Deleting UiAutomator2 session');
         const screenRecordingStopTasks = [
             async () => {
-                if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
+                if (this._screenRecordingProperties) {
                     await this.stopRecordingScreen();
                 }
             },
@@ -700,7 +347,7 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
                 }
             },
             async () => {
-                if (!lodash_1.default.isEmpty(this._screenStreamingProps)) {
+                if (this._screenStreamingProps) {
                     await this.mobileStopScreenStreaming();
                 }
             },
@@ -789,12 +436,6 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
         }
         await super.deleteSession();
     }
-    async checkAppPresent() {
-        this.log.debug('Checking whether app is actually present');
-        if (!this.opts.app || !(await support_1.fs.exists(this.opts.app))) {
-            throw this.log.errorWithException(`Could not find app apk at '${this.opts.app}'`);
-        }
-    }
     async onSettingsUpdate() {
         // intentionally do nothing here, since commands.updateSettings proxies
         // settings to the uiauto2 server already
@@ -848,13 +489,6 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.AndroidDriver {
         }
         return adb;
     }
-    requireUiautomator2() {
-        const server = this.uiautomator2;
-        if (!server) {
-            throw this.log.errorWithException('UiAutomator2 server is not initialized');
-        }
-        return server;
-    }
 }
 exports.AndroidUiautomator2Driver = AndroidUiautomator2Driver;
 //# sourceMappingURL=driver.js.map