github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the stop command

Browse Source
This commit is contained in:
Devon Carew 2015-10-30 12:11:14 -07:00
parent 7115ff2674
commit 48c3d01587
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/flutter_tools/lib/src/device.dart
View File

@ -835,16 +835,23 @@ class AndroidDevice extends Device {
runSync([adbPath, 'shell', 'am', 'force-stop', apk.id]);
// Kill the server
if (Platform.isMacOS) {
String pid = runSync(['lsof', '-i', ':$_serverPort', '-t']);
if (pid.isEmpty) {
String pids = runSync(['lsof', '-i', ':$_serverPort', '-t']).trim();
if (pids.isEmpty) {
_logging.fine('No process to kill for port $_serverPort');
return true;
}
// Killing a pid with a shell command from within dart is hard,
// so use a library command, but it's still nice to give the
// equivalent command when doing verbose logging.
_logging.info('kill $pid');
Process.killPid(int.parse(pid));
// Handle multiple returned pids.
for (String pidString in pids.split('\n')) {
// Killing a pid with a shell command from within dart is hard, so use a
// library command, but it's still nice to give the equivalent command
// when doing verbose logging.
_logging.info('kill $pidString');
int pid = int.parse(pidString, onError: (_) => null);
if (pid != null)
Process.killPid(pid);
}
} else if (Platform.isWindows) {
//Get list of network processes and split on newline
List<String> processes = runSync(['netstat.exe','-ano']).split("\r");