Skip to content

Commit b0abf92

Browse files
Fatme HavaluovaFatme Havaluova
Fatme Havaluova
authored and
Fatme Havaluova
committed
Merge branch 'release' into fatme/merge-release-1.2.2
Conflicts: lib/services/usb-livesync-service.ts
2 parents e97f21e + 4ce3f6e commit b0abf92

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lib/common

lib/services/usb-livesync-service.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import helpers = require("../common/helpers");
77
import usbLivesyncServiceBaseLib = require("../common/services/usb-livesync-service-base");
88
import path = require("path");
99
import semver = require("semver");
10+
import Future = require("fibers/future");
1011

1112
export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncServiceBase implements IUsbLiveSyncService {
1213
private excludedProjectDirsAndFiles = [
@@ -38,7 +39,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
3839
public liveSync(platform: string): IFuture<void> {
3940
return (() => {
4041
platform = platform || this.initialize(platform).wait();
41-
let platformLowerCase = platform.toLowerCase();
42+
let platformLowerCase = platform ? platform.toLowerCase() : null;
4243
let platformData = this.$platformsData.getPlatformData(platformLowerCase);
4344

4445
if(platformLowerCase === this.$devicePlatformsConstants.Android.toLowerCase()) {
@@ -75,7 +76,8 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
7576
let platformSpecificUsbLiveSyncService = this.resolveUsbLiveSyncService(platform || this.$devicesServices.platform, device);
7677
if(platformSpecificUsbLiveSyncService.beforeLiveSyncAction) {
7778
return platformSpecificUsbLiveSyncService.beforeLiveSyncAction(deviceAppData);
78-
}
79+
}
80+
return Future.fromResult();
7981
}
8082

8183
let beforeBatchLiveSyncAction = (filePath: string): IFuture<string> => {

0 commit comments

Comments
 (0)