From 30af76744d798e0d5495c8b8f949acfa4db40e06 Mon Sep 17 00:00:00 2001 From: patotskiy Date: Thu, 16 Jan 2014 14:06:26 +0300 Subject: [PATCH] Fix android multiple devices: android/android-common.js --- lib/devices/android/android-common.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/devices/android/android-common.js b/lib/devices/android/android-common.js index db0aa1dbb..5dbd7eefd 100644 --- a/lib/devices/android/android-common.js +++ b/lib/devices/android/android-common.js @@ -63,12 +63,12 @@ androidCommon.prepareActiveDevice = function(cb) { this.adb.getDevicesWithRetry(function(err, devices) { if (err) return cb(err); var deviceId = null; - if (this.udid) { - if (!_.contains(_.pluck(devices, 'udid'), this.udid)) { - return cb(new Error("Device " + this.udid + " was not in the list " + + if (this.adb.udid) { + if (!_.contains(_.pluck(devices, 'udid'), this.adb.udid)) { + return cb(new Error("Device " + this.adb.udid + " was not in the list " + "of connected devices")); } - deviceId = this.udid; + deviceId = this.adb.udid; } else { deviceId = devices[0].udid; var emPort = this.adb.getPortFromEmulatorString(deviceId);