Add check for platform in all discovery services.

Author: KristianDD

definitions/mobile.d.ts

@@ -413,7 +413,7 @@ declare module Mobile {
 		startDeviceDetectionInterval(): Promise<void>;
 		getDeviceByIdentifier(identifier: string): Mobile.IDevice;
 		mapAbstractToTcpPort(deviceIdentifier: string, appIdentifier: string, framework: string): Promise<string>;
-		detectCurrentlyAttachedDevices(): Promise<void>;
+		detectCurrentlyAttachedDevices(options?: Mobile.IDeviceLookingOptions): Promise<void>;
 		startEmulator(platform?: string, emulatorImage?: string): Promise<void>;
 		isCompanionAppInstalledOnDevices(deviceIdentifiers: string[], framework: string): Promise<IAppInstalledInfo>[];
 		getDebuggableApps(deviceIdentifiers: string[]): Promise<Mobile.IDeviceApplicationInformation[]>[];

mobile/mobile-core/android-device-discovery.ts

@@ -13,7 +13,8 @@ export class AndroidDeviceDiscovery extends DeviceDiscovery implements Mobile.IA
 	private isStarted: boolean;
 
 	constructor(private $injector: IInjector,
-		private $adb: Mobile.IAndroidDebugBridge) {
+		private $adb: Mobile.IAndroidDebugBridge,
+		private $mobileHelper: Mobile.IMobileHelper) {
 		super();
 	}
 
@@ -29,7 +30,10 @@ export class AndroidDeviceDiscovery extends DeviceDiscovery implements Mobile.IA
 		this.removeDevice(deviceIdentifier);
 	}
 
-	public async startLookingForDevices(): Promise<void> {
+	public async startLookingForDevices(options?: Mobile.IDeviceLookingOptions): Promise<void> {
+		if (options && options.platform && !this.$mobileHelper.isAndroidPlatform(options.platform)) {
+			return;
+		}
 		await this.ensureAdbServerStarted();
 		await this.checkForDevices();
 	}

mobile/mobile-core/devices-service.ts

@@ -256,7 +256,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	 * @param identifier parameter passed by the user to --device flag
 	 */
 	public async getDevice(deviceOption: string): Promise<Mobile.IDevice> {
-		await this.detectCurrentlyAttachedDevices();
+		await this.detectCurrentlyAttachedDevices({ shouldReturnImmediateResult: false, platform: this._platform });
 		let device: Mobile.IDevice = null;
 
 		let emulatorIdentifier = null;

mobile/mobile-core/ios-device-discovery.ts

@@ -7,6 +7,7 @@ export class IOSDeviceDiscovery extends DeviceDiscovery {
 	constructor(private $injector: IInjector,
 		private $logger: ILogger,
 		private $iTunesValidator: Mobile.IiTunesValidator,
+		private $mobileHelper: Mobile.IMobileHelper,
 		private $iosDeviceOperations: IIOSDeviceOperations) {
 		super();
 	}
@@ -24,6 +25,9 @@ export class IOSDeviceDiscovery extends DeviceDiscovery {
 	}
 
 	public async startLookingForDevices(options?: Mobile.IDeviceLookingOptions): Promise<void> {
+		if (options && options.platform && !this.$mobileHelper.isiOSPlatform(options.platform)) {
+			return;
+		}
 		if (this.validateiTunes()) {
 			await this.$iosDeviceOperations.startLookingForDevices((deviceInfo: IOSDeviceLib.IDeviceActionInfo) => {
 				this.createAndAddDevice(deviceInfo);

mobile/mobile-core/ios-simulator-discovery.ts

@@ -7,11 +7,16 @@ export class IOSSimulatorDiscovery extends DeviceDiscovery {
 	constructor(private $injector: IInjector,
 		private $childProcess: IChildProcess,
 		private $iOSSimResolver: Mobile.IiOSSimResolver,
+		private $mobileHelper: Mobile.IMobileHelper,
 		private $hostInfo: IHostInfo) {
 		super();
 	}
 
-	public async startLookingForDevices(): Promise<void> {
+	public async startLookingForDevices(options?: Mobile.IDeviceLookingOptions): Promise<void> {
+		if (options && options.platform && !this.$mobileHelper.isiOSPlatform(options.platform)) {
+			return;
+		}
+
 		return new Promise<void>((resolve, reject) => {
 			return this.checkForDevices(resolve, reject);
 		});

test/unit-tests/mobile/android-device-discovery.ts

@@ -40,6 +40,11 @@ function createTestInjector(): IInjector {
 	injector.register("errors", {});
 	injector.register("logger", {});
 	injector.register("androidDebugBridgeResultHandler", AndroidDebugBridgeResultHandler);
+	injector.register("mobileHelper", {
+		isAndroidPlatform: () => {
+			return true;
+		}
+	});
 	injector.register("childProcess", {
 		spawn: (command: string, args?: string[], options?: any) => {
 			mockChildProcess = new MockEventEmitter();

test/unit-tests/mobile/ios-simulator-discovery.ts

@@ -25,6 +25,12 @@ function createTestInjector(): IInjector {
 
 	injector.register("devicePlatformsConstants", DevicePlatformsConstants);
 
+	injector.register("mobileHelper", {
+		isiOSPlatform: () => {
+			return true;
+		}
+	});
+
 	injector.register("iOSSimulatorDiscovery", IOSSimulatorDiscovery);
 
 	injector.register("iOSSimulatorLogProvider", {});