nativescript 9.1.0-alpha.15 → 9.1.0-alpha.17

package/lib/common/logger/appenders/emit-appender.js

@@ -21,13 +21,9 @@ function configure(config, layouts) {
     if (!config.emitter.emit || typeof config.emitter.emit !== "function") {
         throw new Error("The passed emitter must be instance of EventEmitter");
     }
-    // the default layout for the appender
     let layout = layouts.messagePassThroughLayout;
-    // check if there is another layout specified
     if (config.layout) {
         layout = layouts.layout(config.layout.type, config.layout);
     }
-    // create a new appender instance
     return emitAppender(layout, config.emitter);
 }
-//# sourceMappingURL=emit-appender.js.map

package/lib/common/logger/layouts/cli-layout.d.ts

@@ -0,0 +1,2 @@
+import { LoggingEvent } from "log4js";
+export declare function layout(config: any): (logEvent: LoggingEvent) => string;

package/lib/common/logger/layouts/cli-layout.js

@@ -30,4 +30,3 @@ function layout(config) {
         return msg;
     };
 }
-//# sourceMappingURL=cli-layout.js.map

package/lib/common/logger/logger.d.ts

@@ -0,0 +1,24 @@
+export declare class Logger implements ILogger {
+    private $config;
+    private log4jsLogger;
+    private passwordRegex;
+    private passwordReplacement;
+    private defaultLogLevel;
+    constructor($config: Config.IConfig);
+    initialize(opts?: ILoggerOptions): void;
+    initializeCliLogger(opts?: ILoggerOptions): void;
+    getLevel(): string;
+    fatal(...args: any[]): void;
+    error(...args: any[]): void;
+    warn(...args: any[]): void;
+    info(...args: any[]): void;
+    debug(...args: any[]): void;
+    trace(...args: any[]): void;
+    prepare(item: any): string;
+    printMarkdown(...args: string[]): void;
+    isVerbose(): boolean;
+    clearScreen(): void;
+    private logMessage;
+    private getLogOptionsForMessage;
+    private getPasswordEncodedArguments;
+}

package/lib/common/logger/logger.js

@@ -98,11 +98,9 @@ class Logger {
         if (typeof item === "string") {
             return item;
         }
-        // do not try to read streams, because they may not be rewindable
         if (item instanceof stream.Readable) {
             return "[ReadableStream]";
         }
-        // There's no point in printing buffers
         if (item instanceof Buffer) {
             return "[Buffer]";
         }
@@ -155,14 +153,12 @@ class Logger {
     getLogOptionsForMessage(data) {
         const loggerOptionKeys = _.keys(constants_1.LoggerConfigData);
         const dataToCheck = data.filter((el) => {
-            // objects created with Object.create(null) do not have `hasOwnProperty` function
             if (!!el &&
                 typeof el === "object" &&
                 el.hasOwnProperty &&
                 typeof el.hasOwnProperty === "function") {
                 for (const key of loggerOptionKeys) {
                     if (el.hasOwnProperty(key)) {
-                        // include only the elements which have one of the keys we've specified as logger options
                         return true;
                     }
                 }
@@ -201,4 +197,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], Logger.prototype, "initialize", null);
 yok_1.injector.register("logger", Logger);
-//# sourceMappingURL=logger.js.map

package/lib/common/messages/messages.d.ts

@@ -0,0 +1,7 @@
+export declare class Messages implements IMessages {
+    Devices: {
+        NotFoundDeviceByIdentifierErrorMessage: string;
+        NotFoundDeviceByIdentifierErrorMessageWithIdentifier: string;
+        NotFoundDeviceByIndexErrorMessage: string;
+    };
+}

package/lib/common/messages/messages.js

@@ -1,11 +1,7 @@
 "use strict";
-//
-// automatically generated code; do not edit manually!
-//
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
 const yok_1 = require("../yok");
-/* tslint:disable:all */
 class Messages {
     constructor() {
         this.Devices = {
@@ -17,5 +13,3 @@ class Messages {
 }
 exports.Messages = Messages;
 yok_1.injector.register("messages", Messages);
-/* tslint:enable */
-//# sourceMappingURL=messages.js.map

package/lib/common/mobile/android/android-application-manager.d.ts

@@ -0,0 +1,31 @@
+import { ApplicationManagerBase } from "../application-manager-base";
+import { IOptions } from "../../../declarations";
+import { IAndroidBuildData } from "../../../definitions/build";
+import { IAndroidBundleToolService } from "../../../definitions/android-bundle-tool-service";
+import { IFileSystem, Server, IErrors, IHooksService, IDictionary } from "../../declarations";
+export declare class AndroidApplicationManager extends ApplicationManagerBase {
+    private adb;
+    private identifier;
+    private $androidBundleToolService;
+    private $fs;
+    private $options;
+    private $logcatHelper;
+    private $androidProcessService;
+    private $httpClient;
+    protected $deviceLogProvider: Mobile.IDeviceLogProvider;
+    private $errors;
+    PID_CHECK_INTERVAL: number;
+    PID_CHECK_TIMEOUT: number;
+    constructor(adb: Mobile.IDeviceAndroidDebugBridge, identifier: string, $androidBundleToolService: IAndroidBundleToolService, $fs: IFileSystem, $options: IOptions, $logcatHelper: Mobile.ILogcatHelper, $androidProcessService: Mobile.IAndroidProcessService, $httpClient: Server.IHttpClient, $deviceLogProvider: Mobile.IDeviceLogProvider, $errors: IErrors, $logger: ILogger, $hooksService: IHooksService);
+    getInstalledApplications(): Promise<string[]>;
+    installApplication(packageFilePath: string, appIdentifier?: string, buildData?: IAndroidBuildData): Promise<void>;
+    uninstallApplication(appIdentifier: string): Promise<void>;
+    startApplication(appData: Mobile.IStartApplicationData): Promise<void>;
+    private onAppLaunch;
+    private getAppProcessId;
+    stopApplication(appData: Mobile.IApplicationData): Promise<void>;
+    getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]>;
+    getDebuggableAppViews(appIdentifiers: string[]): Promise<IDictionary<Mobile.IDebugWebViewInfo[]>>;
+    private getFullyQualifiedActivityRegex;
+    private hasValidApksFile;
+}

package/lib/common/mobile/android/android-application-manager.js

@@ -29,7 +29,7 @@ class AndroidApplicationManager extends application_manager_base_1.ApplicationMa
         this.$deviceLogProvider = $deviceLogProvider;
         this.$errors = $errors;
         this.PID_CHECK_INTERVAL = 100;
-        this.PID_CHECK_TIMEOUT = 10000; // 10 secs
+        this.PID_CHECK_TIMEOUT = 10000;
     }
     async getInstalledApplications() {
         const result = (await this.adb.executeShellCommand(["pm", "list", "packages"])) || "";
@@ -67,7 +67,6 @@ class AndroidApplicationManager extends application_manager_base_1.ApplicationMa
         }
     }
     uninstallApplication(appIdentifier) {
-        // Need to set the treatErrorsAsWarnings to true because when using `ns run` command if the application is not installed on the device it will throw error
         return this.adb.executeShellCommand(["pm", "uninstall", `${appIdentifier}`], { treatErrorsAsWarnings: true });
     }
     async startApplication(appData) {
@@ -76,24 +75,9 @@ class AndroidApplicationManager extends application_manager_base_1.ApplicationMa
                 `cat /dev/null > ${constants_1.LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${appData.appId}-debugbreak`,
             ]);
         }
-        // If the app is debuggable, the Runtime will update the file when its ready for debugging
-        // and we will be able to take decisions and synchronize the debug experience based on the content
         await this.adb.executeShellCommand([
             `cat /dev/null > ${constants_1.LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${appData.appId}-debugger-started`,
         ]);
-        /*
-        Example "pm dump <app_identifier> | grep -A 1 MAIN" output"
-            android.intent.action.MAIN:
-            3b2df03 org.nativescript.cliapp/com.tns.NativeScriptActivity filter 50dd82e
-            Action: "android.intent.action.MAIN"
-            Category: "android.intent.category.LAUNCHER"
-            --
-            intent={act=android.intent.action.MAIN cat=[android.intent.category.LAUNCHER] flg=0x10200000 cmp=org.nativescript.cliapp/com.tns.NativeScriptActivity}
-            realActivity=org.nativescript.cliapp/com.tns.NativeScriptActivity
-            --
-            Intent { act=android.intent.action.MAIN cat=[android.intent.category.LAUNCHER] flg=0x10200000 cmp=org.nativescript.cliapp/com.tns.NativeScriptActivity }
-            frontOfTask=true task=TaskRecord{fe592ac #449 A=org.nativescript.cliapp U=0 StackId=1 sz=1}
-        */
         const appIdentifier = appData.appId;
         const pmDumpOutput = await this.adb.executeShellCommand([
             "pm",
@@ -143,8 +127,6 @@ class AndroidApplicationManager extends application_manager_base_1.ApplicationMa
                     pid: processIdentifier,
                     appId: appIdentifier,
                     onAppRestarted: () => {
-                        // If the app restarts, we update the PID and
-                        // restart log helper.
                         this.onAppLaunch(appData);
                     },
                 });
@@ -223,4 +205,3 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], AndroidApplicationManager.prototype, "getFullyQualifiedActivityRegex", null);
-//# sourceMappingURL=android-application-manager.js.map

package/lib/common/mobile/android/android-debug-bridge-result-handler.d.ts

@@ -0,0 +1,9 @@
+import { IErrors } from "../../declarations";
+export declare class AndroidDebugBridgeResultHandler implements Mobile.IAndroidDebugBridgeResultHandler {
+    private $logger;
+    private $errors;
+    private static ANDROID_DEBUG_BRIDGE_ERRORS;
+    constructor($logger: ILogger, $errors: IErrors);
+    checkForErrors(adbResult: any): Mobile.IAndroidDebugBridgeError[];
+    handleErrors(errors: Mobile.IAndroidDebugBridgeError[], treatErrorsAsWarnings?: boolean): void;
+}

package/lib/common/mobile/android/android-debug-bridge-result-handler.js

@@ -330,4 +330,3 @@ AndroidDebugBridgeResultHandler.ANDROID_DEBUG_BRIDGE_ERRORS = [
     },
 ];
 yok_1.injector.register("androidDebugBridgeResultHandler", AndroidDebugBridgeResultHandler);
-//# sourceMappingURL=android-debug-bridge-result-handler.js.map

package/lib/common/mobile/android/android-debug-bridge.d.ts

@@ -0,0 +1,24 @@
+import { IChildProcess, IErrors } from "../../declarations";
+interface IComposeCommandResult {
+    command: string;
+    args: string[];
+}
+export declare class AndroidDebugBridge implements Mobile.IAndroidDebugBridge {
+    protected $childProcess: IChildProcess;
+    protected $errors: IErrors;
+    protected $logger: ILogger;
+    protected $staticConfig: Config.IStaticConfig;
+    protected $androidDebugBridgeResultHandler: Mobile.IAndroidDebugBridgeResultHandler;
+    private adbFilePath;
+    constructor($childProcess: IChildProcess, $errors: IErrors, $logger: ILogger, $staticConfig: Config.IStaticConfig, $androidDebugBridgeResultHandler: Mobile.IAndroidDebugBridgeResultHandler);
+    protected init(): Promise<void>;
+    executeCommand(args: string[], options?: Mobile.IAndroidDebugBridgeCommandOptions): Promise<any>;
+    getPropertyValue(deviceId: string, propertyName: string): Promise<string>;
+    getDevices(): Promise<string[]>;
+    getDevicesSafe(): Promise<string[]>;
+    protected composeCommand(params: string[], identifier?: string): Promise<IComposeCommandResult>;
+    executeShellCommand(args: string[], options?: Mobile.IAndroidDebugBridgeCommandOptions): Promise<any>;
+    pushFile(localFilePath: string, deviceFilePath: string): Promise<void>;
+    removeFile(deviceFilePath: string): Promise<void>;
+}
+export {};

package/lib/common/mobile/android/android-debug-bridge.js

@@ -38,15 +38,11 @@ class AndroidDebugBridge {
                 return this.$childProcess.spawn(command.command, command.args);
             }
         }
-        // If adb -s <invalid device id> install <smth> is executed the childProcess won't get any response
-        // because the adb will be waiting for valid device and will not send close or exit event.
-        // For example `adb -s <invalid device id> install <smth>` throws error 'error: device \'030939f508e6c773\' not found\r\n' exitCode 4294967295
         const result = await this.$childProcess.spawnFromEvent(command.command, command.args, event, childProcessOptions, { throwError: false });
         const errors = this.$androidDebugBridgeResultHandler.checkForErrors(result);
         if (errors && errors.length > 0) {
             this.$androidDebugBridgeResultHandler.handleErrors(errors, treatErrorsAsWarnings);
         }
-        // Some adb commands returns array of strings instead of object with stdout and stderr. (adb start-server)
         return result.stdout === undefined || result.stdout === null
             ? result
             : result.stdout;
@@ -125,7 +121,6 @@ class AndroidDebugBridge {
     }
     async pushFile(localFilePath, deviceFilePath) {
         const fileDirectory = (0, helpers_1.fromWindowsRelativePathToUnix)(path.dirname(deviceFilePath));
-        // starting from API level 28, the push command is returning an error if the directory does not exist
         await this.executeShellCommand(["mkdir", "-p", fileDirectory]);
         await this.executeCommand(["push", localFilePath, deviceFilePath]);
         await this.executeShellCommand(["chmod", "0777", fileDirectory]);
@@ -145,4 +140,3 @@ __decorate([
     (0, decorators_1.invokeInit)()
 ], AndroidDebugBridge.prototype, "getDevices", null);
 yok_1.injector.register("adb", AndroidDebugBridge);
-//# sourceMappingURL=android-debug-bridge.js.map

package/lib/common/mobile/android/android-device-file-system.d.ts

@@ -0,0 +1,26 @@
+import { IFileSystem, IStringDictionary } from "../../declarations";
+import { IInjector } from "../../definitions/yok";
+import { ITempService } from "../../../definitions/temp-service";
+export declare class AndroidDeviceFileSystem implements Mobile.IDeviceFileSystem {
+    private adb;
+    private $fs;
+    private $logger;
+    private $mobileHelper;
+    private $tempService;
+    private $injector;
+    private _deviceHashServices;
+    constructor(adb: Mobile.IDeviceAndroidDebugBridge, $fs: IFileSystem, $logger: ILogger, $mobileHelper: Mobile.IMobileHelper, $tempService: ITempService, $injector: IInjector);
+    listFiles(devicePath: string, appIdentifier?: string): Promise<any>;
+    getFile(deviceFilePath: string, appIdentifier: string, outputPath?: string): Promise<void>;
+    getFileContent(deviceFilePath: string, appIdentifier: string): Promise<string>;
+    putFile(localFilePath: string, deviceFilePath: string, appIdentifier: string): Promise<void>;
+    transferFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<Mobile.ILocalToDevicePathData[]>;
+    transferDirectory(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string): Promise<Mobile.ILocalToDevicePathData[]>;
+    private chmodFiles;
+    private pushFiles;
+    transferFile(localPath: string, devicePath: string): Promise<void>;
+    createFileOnDevice(deviceFilePath: string, fileContent: string): Promise<void>;
+    deleteFile(deviceFilePath: string, appIdentifier: string): Promise<void>;
+    updateHashesOnDevice(hashes: IStringDictionary, appIdentifier: string): Promise<void>;
+    getDeviceHashService(appIdentifier: string): Mobile.IAndroidDeviceHashService;
+}

package/lib/common/mobile/android/android-device-file-system.js

@@ -74,8 +74,6 @@ class AndroidDeviceFileSystem {
         return transferredFiles;
     }
     async transferDirectory(deviceAppData, localToDevicePaths, projectFilesPath) {
-        // starting from Android 9, adb push is throwing an exception when there are subfolders
-        // the check could be removed when we start supporting only runtime versions with sockets
         const minAndroidWithoutAdbPushDir = "9.0.0";
         const isAdbPushDirSupported = semver.lt(semver.coerce(deviceAppData.device.deviceInfo.version), minAndroidWithoutAdbPushDir);
         const deviceProjectDir = await deviceAppData.getDeviceProjectRootPath();
@@ -122,7 +120,6 @@ class AndroidDeviceFileSystem {
         const hostTmpDir = await this.$tempService.mkdirSync("application-");
         const commandsFileHostPath = path.join(hostTmpDir, "temp.commands.file");
         this.$fs.writeFile(commandsFileHostPath, fileContent);
-        // copy it to the device
         await this.transferFile(commandsFileHostPath, deviceFilePath);
         await this.adb.executeShellCommand(["chmod", "0777", deviceFilePath]);
     }
@@ -144,4 +141,3 @@ class AndroidDeviceFileSystem {
     }
 }
 exports.AndroidDeviceFileSystem = AndroidDeviceFileSystem;
-//# sourceMappingURL=android-device-file-system.js.map

package/lib/common/mobile/android/android-device-hash-service.d.ts

@@ -0,0 +1,23 @@
+import { IFileSystem, IStringDictionary } from "../../declarations";
+import { ITempService } from "../../../definitions/temp-service";
+export declare class AndroidDeviceHashService implements Mobile.IAndroidDeviceHashService {
+    private adb;
+    private appIdentifier;
+    private $fs;
+    private $mobileHelper;
+    private $tempService;
+    private static HASH_FILE_NAME;
+    constructor(adb: Mobile.IDeviceAndroidDebugBridge, appIdentifier: string, $fs: IFileSystem, $mobileHelper: Mobile.IMobileHelper, $tempService: ITempService);
+    get hashFileDevicePath(): string;
+    doesShasumFileExistsOnDevice(): Promise<boolean>;
+    getShasumsFromDevice(): Promise<IStringDictionary>;
+    uploadHashFileToDevice(data: IStringDictionary): Promise<void>;
+    updateHashes(localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void>;
+    generateHashesFromLocalToDevicePaths(localToDevicePaths: Mobile.ILocalToDevicePathData[], initialShasums?: IStringDictionary): Promise<IStringDictionary>;
+    getDevicePaths(localToDevicePaths: Mobile.ILocalToDevicePathData[]): string[];
+    getChangedShasums(oldShasums: IStringDictionary, currentShasums: IStringDictionary): IStringDictionary;
+    removeHashes(localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<boolean>;
+    private getHashFileLocalPath;
+    private getTempDir;
+    private downloadHashFileFromDevice;
+}

package/lib/common/mobile/android/android-device-hash-service.js

@@ -51,8 +51,6 @@ class AndroidDeviceHashService {
         const action = async (localToDevicePathData) => {
             const localPath = localToDevicePathData.getLocalPath();
             if (this.$fs.getFsStats(localPath).isFile()) {
-                // TODO: Use relative to project path for key
-                // This will speed up livesync on the same device for the same project on different PCs.
                 initialShasums[localPath] = await this.$fs.getFileShasum(localPath);
             }
         };
@@ -108,4 +106,3 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], AndroidDeviceHashService.prototype, "getTempDir", null);
-//# sourceMappingURL=android-device-hash-service.js.map

package/lib/common/mobile/android/android-device.d.ts

@@ -0,0 +1,24 @@
+import { IInjector } from "../../definitions/yok";
+export declare class AndroidDevice implements Mobile.IAndroidDevice {
+    private identifier;
+    private status;
+    private $androidEmulatorServices;
+    private $logger;
+    private $devicePlatformsConstants;
+    private $logcatHelper;
+    private $injector;
+    adb: Mobile.IDeviceAndroidDebugBridge;
+    applicationManager: Mobile.IDeviceApplicationManager;
+    fileSystem: Mobile.IAndroidDeviceFileSystem;
+    deviceInfo: Mobile.IDeviceInfo;
+    private static ADB_DEVICE_STATUS_INFO;
+    constructor(identifier: string, status: string, $androidEmulatorServices: Mobile.IEmulatorPlatformService, $logger: ILogger, $devicePlatformsConstants: Mobile.IDevicePlatformsConstants, $logcatHelper: Mobile.ILogcatHelper, $injector: IInjector);
+    init(): Promise<void>;
+    get isEmulator(): boolean;
+    get isOnlyWiFiConnected(): boolean;
+    openDeviceLogStream(): Promise<void>;
+    detach(): void;
+    private getDeviceDetails;
+    private getIsTablet;
+    private getType;
+}

package/lib/common/mobile/android/android-device.js

@@ -32,8 +32,6 @@ class AndroidDevice {
         this.fileSystem = this.$injector.resolve(fileSystemPath.AndroidDeviceFileSystem, { adb: this.adb });
         let details = await this.getDeviceDetails(["getprop"]);
         if (!details || !details.name) {
-            // In older CLI versions we are calling cat /system/build.prop to get details.
-            // Keep this logic for compatibility and possibly for devices for which getprop is not working
             details = await this.getDeviceDetails(["cat", "/system/build.prop"]);
         }
         this.$logger.trace(details);
@@ -90,9 +88,6 @@ class AndroidDevice {
         try {
             const details = await this.adb.executeShellCommand(shellCommandArgs);
             details.split(/\r?\n|\r/).forEach((value) => {
-                // sample line is "ro.build.version.release=4.4" in /system/build.prop
-                // sample line from getprop is:  [ro.build.version.release]: [6.0]
-                // NOTE: some props do not have value: [ro.build.version.base_os]: []
                 const match = /(?:\[?ro\.build\.version|ro\.product|ro\.build)\.(.+?)]?(?:\:|=)(?:\s*?\[)?(.*?)]?$/.exec(value);
                 if (match) {
                     parsedDetails[match[1]] = match[2];
@@ -106,7 +101,6 @@ class AndroidDevice {
         return parsedDetails;
     }
     getIsTablet(details) {
-        //version 3.x.x (also known as Honeycomb) is a tablet only version
         return (details &&
             (_.startsWith(details.release, "3.") ||
                 _.includes((details.characteristics || "").toLowerCase(), "tablet")));
@@ -120,7 +114,6 @@ class AndroidDevice {
     }
 }
 exports.AndroidDevice = AndroidDevice;
-// http://stackoverflow.com/questions/31178195/what-does-adb-device-status-mean
 AndroidDevice.ADB_DEVICE_STATUS_INFO = {
     device: {
         errorHelp: null,
@@ -146,4 +139,3 @@ AndroidDevice.ADB_DEVICE_STATUS_INFO = {
 __decorate([
     (0, decorators_1.cache)()
 ], AndroidDevice.prototype, "init", null);
-//# sourceMappingURL=android-device.js.map

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

@@ -0,0 +1,23 @@
+import { IChildProcess, IUserSettingsService, IUtils } from "../../declarations";
+export declare class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService {
+    private $androidGenymotionService;
+    private $androidVirtualDeviceService;
+    private $adb;
+    private $childProcess;
+    private $emulatorHelper;
+    private $logger;
+    private $utils;
+    private $userSettingsService;
+    constructor($androidGenymotionService: Mobile.IAndroidVirtualDeviceService, $androidVirtualDeviceService: Mobile.IAndroidVirtualDeviceService, $adb: Mobile.IAndroidDebugBridge, $childProcess: IChildProcess, $emulatorHelper: Mobile.IEmulatorHelper, $logger: ILogger, $utils: IUtils, $userSettingsService: IUserSettingsService);
+    getEmulatorImages(): Promise<Mobile.IEmulatorImagesOutput>;
+    getRunningEmulatorIds(): Promise<string[]>;
+    getRunningEmulatorName(emulatorId: string): Promise<string>;
+    getRunningEmulatorImageIdentifier(emulatorId: string): Promise<string>;
+    startEmulator(options: Mobile.IAndroidStartEmulatorOptions): Promise<Mobile.IStartEmulatorOutput>;
+    detach(deviceInfo: Mobile.IDeviceInfo): void;
+    private startEmulatorCore;
+    private spawnEmulator;
+    private getBestFit;
+    private waitForEmulatorBootToComplete;
+    private isEmulatorBootCompleted;
+}

package/lib/common/mobile/android/android-emulator-services.js

@@ -104,7 +104,7 @@ class AndroidEmulatorServices {
                     endTimeEpoch,
                 };
             }
-            await (0, helpers_1.sleep)(10000); // the emulator definitely takes its time to wake up
+            await (0, helpers_1.sleep)(10000);
             hasTimeLeft = (0, helpers_1.getCurrentEpochTime)() < endTimeEpoch;
         }
         if (!hasTimeLeft && !isInfiniteWait) {
@@ -188,4 +188,3 @@ class AndroidEmulatorServices {
 }
 exports.AndroidEmulatorServices = AndroidEmulatorServices;
 yok_1.injector.register("androidEmulatorServices", AndroidEmulatorServices);
-//# sourceMappingURL=android-emulator-services.js.map

package/lib/common/mobile/android/android-ini-file-parser.d.ts

@@ -0,0 +1,8 @@
+import { IFileSystem } from "../../declarations";
+export declare class AndroidIniFileParser implements Mobile.IAndroidIniFileParser {
+    private $fs;
+    constructor($fs: IFileSystem);
+    parseIniFile(iniFilePath: string): Mobile.IAvdInfo;
+    private getAvdEncoding;
+    private readTargetNum;
+}

package/lib/common/mobile/android/android-ini-file-parser.js

@@ -12,8 +12,6 @@ class AndroidIniFileParser {
         if (!this.$fs.exists(iniFilePath)) {
             return null;
         }
-        // avd files can have different encoding, defined on the first line.
-        // find which one it is (if any) and use it to correctly read the file contents
         const encoding = this.getAvdEncoding(iniFilePath);
         const contents = this.$fs.readText(iniFilePath, encoding).split("\n");
         return _.reduce(contents, (result, line) => {
@@ -46,8 +44,6 @@ class AndroidIniFileParser {
         }, Object.create(null));
     }
     getAvdEncoding(avdName) {
-        // avd files can have different encoding, defined on the first line.
-        // find which one it is (if any) and use it to correctly read the file contents
         let encoding = "utf8";
         let contents = this.$fs.readText(avdName, "ascii");
         if (contents.length > 0) {
@@ -61,22 +57,18 @@ class AndroidIniFileParser {
         }
         return encoding;
     }
-    // Android L is not written as a number in the .ini files, and we need to convert it
     readTargetNum(target) {
         const platform = target.replace("android-", "");
         let platformNumber = +platform;
         if (isNaN(platformNumber)) {
-            // this may be a google image
             const googlePlatform = target.split(":")[2];
             if (googlePlatform) {
                 platformNumber = +googlePlatform;
             }
             else if (platform === "L") {
-                // Android SDK 20 preview
                 platformNumber = 20;
             }
             else if (platform === "MNC") {
-                // Android M preview
                 platformNumber = 22;
             }
         }
@@ -85,4 +77,3 @@ class AndroidIniFileParser {
 }
 exports.AndroidIniFileParser = AndroidIniFileParser;
 yok_1.injector.register("androidIniFileParser", AndroidIniFileParser);
-//# sourceMappingURL=android-ini-file-parser.js.map

package/lib/common/mobile/android/android-log-filter.d.ts

@@ -0,0 +1,11 @@
+export declare class AndroidLogFilter implements Mobile.IPlatformLogFilter {
+    private $loggingLevels;
+    private static LINE_REGEX;
+    private static API_LEVEL_23_LINE_REGEX;
+    constructor($loggingLevels: Mobile.ILoggingLevels);
+    filterData(data: string, loggingOptions?: Mobile.IDeviceLogOptions): string;
+    getConsoleLogFromLine(lineText: string, pid: string): {
+        tag: string;
+        message: string;
+    };
+}

package/lib/common/mobile/android/android-log-filter.js

@@ -37,10 +37,6 @@ class AndroidLogFilter {
     }
 }
 exports.AndroidLogFilter = AndroidLogFilter;
-//sample line is "I/Web Console(    4438): Received Event: deviceready at file:///storage/emulated/0/Icenium/com.telerik.TestApp/js/index.js:48"
 AndroidLogFilter.LINE_REGEX = /.\/(.+?)\s*\(\s*\d+?\): (.*)/;
-// sample line is "11-23 12:39:07.310  1584  1597 I art     : Background sticky concurrent mark sweep GC freed 21966(1780KB) AllocSpace objects, 4(80KB) LOS objects, 77% free, 840KB/3MB, paused 4.018ms total 158.629ms"
-// or '12-28 10:45:08.020  3329  3329 W chromium: [WARNING:data_reduction_proxy_settings.cc(328)] SPDY proxy OFF at startup'
 AndroidLogFilter.API_LEVEL_23_LINE_REGEX = /.+?\s+?(?:[A-Z]\s+?)([A-Za-z \.]+?)\s*?\: (.*)/;
 yok_1.injector.register("androidLogFilter", AndroidLogFilter);
-//# sourceMappingURL=android-log-filter.js.map

package/lib/common/mobile/android/android-virtual-device-service.d.ts

@@ -0,0 +1,37 @@
+import { IChildProcess, IFileSystem, IHostInfo, ISysInfo } from "../../declarations";
+export declare class AndroidVirtualDeviceService implements Mobile.IAndroidVirtualDeviceService {
+    private $androidIniFileParser;
+    private $childProcess;
+    private $devicePlatformsConstants;
+    private $emulatorHelper;
+    private $fs;
+    private $hostInfo;
+    private $sysInfo;
+    private $logger;
+    private androidHome;
+    private mapEmulatorIdToImageIdentifier;
+    constructor($androidIniFileParser: Mobile.IAndroidIniFileParser, $childProcess: IChildProcess, $devicePlatformsConstants: Mobile.IDevicePlatformsConstants, $emulatorHelper: Mobile.IEmulatorHelper, $fs: IFileSystem, $hostInfo: IHostInfo, $sysInfo: ISysInfo, $logger: ILogger);
+    getEmulatorImages(adbDevicesOutput: string[]): Promise<Mobile.IEmulatorImagesOutput>;
+    getRunningEmulatorIds(adbDevicesOutput: string[]): Promise<string[]>;
+    getRunningEmulatorName(emulatorId: string): Promise<string>;
+    startEmulatorArgs(imageIdentifier: string): string[];
+    get pathToEmulatorExecutable(): string;
+    getRunningEmulatorImageIdentifier(emulatorId: string): Promise<string>;
+    detach(deviceInfo: Mobile.IDeviceInfo): void;
+    private getEmulatorImagesCore;
+    private canExecuteAvdManagerCommand;
+    private getRunningEmulatorData;
+    private get pathToAvdManagerExecutable();
+    private get pathToAndroidExecutable();
+    private get pathToAvdHomeDir();
+    private getConfigurationError;
+    private getExecutableName;
+    private listAvdsFromDirectory;
+    private parseListAvdsOutput;
+    private getAvdManagerDeviceInfo;
+    private getInfoFromAvd;
+    private convertAvdToDeviceInfo;
+    private getImageIdentifierFromClientOutput;
+    private getIniFilePath;
+    private clearNetConnection;
+}