kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve the getDeviceSDKVersion call, make it skip errors and bypass if no devices seem to be connected

Browse Source
This commit is contained in:
Joshua Granick
2015-01-16 08:42:36 -08:00
parent 46f58e1491
commit e2aff76b27
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/helpers/AndroidHelper.hx
View File

@@ -82,6 +82,9 @@ class AndroidHelper {
public static function getDeviceSDKVersion (deviceID:String):Int { public static function getDeviceSDKVersion (deviceID:String):Int {
var devices = listDevices ();
if (devices.length == 0) return 0;
var tempFile = PathHelper.getTemporaryFile (); var tempFile = PathHelper.getTemporaryFile ();
var args = [ "wait-for-device", "shell", "getprop", "ro.build.version.sdk", ">", tempFile ]; var args = [ "wait-for-device", "shell", "getprop", "ro.build.version.sdk", ">", tempFile ];
@@ -97,11 +100,11 @@ class AndroidHelper {
if (PlatformHelper.hostPlatform == Platform.MAC) { if (PlatformHelper.hostPlatform == Platform.MAC) {
ProcessHelper.runCommand (adbPath, "perl", [ "-e", 'alarm shift @ARGV; exec @ARGV', "3", adbName ].concat (args)); ProcessHelper.runCommand (adbPath, "perl", [ "-e", 'alarm shift @ARGV; exec @ARGV', "3", adbName ].concat (args), true, true);
} else { } else {
ProcessHelper.runCommand (adbPath, adbName, args); ProcessHelper.runCommand (adbPath, adbName, args, true, true);
} }