Fix android multiple devices: android/android-common.js

This commit is contained in:
patotskiy
2014-01-16 14:06:26 +03:00
parent ecc0f6aee2
commit 30af76744d
+4 -4
View File
@@ -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);