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 a regression in adb forward

Browse Source
This commit is contained in:
Devon Carew 2016-03-12 10:41:34 -08:00
parent c7ad846d98
commit ce9111b591
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/flutter_tools/lib/src/android/android_device.dart
View File

@ -549,12 +549,9 @@ class _AndroidDevicePortForwarder extends DevicePortForwarder {
List<ForwardedPort> get forwardedPorts {
final List<ForwardedPort> ports = <ForwardedPort>[];
String stdout = runCheckedSync(
<String>[
androidSdk.adbPath,
'forward',
'--list'
]);
String stdout = runCheckedSync(device.adbCommandForDevice(
<String>['forward', '--list']
));
List<String> lines = LineSplitter.split(stdout).toList();
for (String line in lines) {
@ -586,24 +583,16 @@ class _AndroidDevicePortForwarder extends DevicePortForwarder {
hostPort = await findAvailablePort();
}
runCheckedSync(
<String>[
androidSdk.adbPath,
'forward',
'tcp:$hostPort',
'tcp:$devicePort',
]);
runCheckedSync(device.adbCommandForDevice(
<String>['forward', 'tcp:$hostPort', 'tcp:$devicePort']
));
return hostPort;
}
Future unforward(ForwardedPort forwardedPort) async {
runCheckedSync(
<String>[
androidSdk.adbPath,
'forward',
'--remove',
'tcp:${forwardedPort.hostPort}'
]);
runCheckedSync(device.adbCommandForDevice(
<String>['forward', '--remove', 'tcp:${forwardedPort.hostPort}']
));
}
}