diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index c126f852a63..1c9b6c3f728 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -549,12 +549,9 @@ class _AndroidDevicePortForwarder extends DevicePortForwarder { List get forwardedPorts { final List ports = []; - String stdout = runCheckedSync( - [ - androidSdk.adbPath, - 'forward', - '--list' - ]); + String stdout = runCheckedSync(device.adbCommandForDevice( + ['forward', '--list'] + )); List lines = LineSplitter.split(stdout).toList(); for (String line in lines) { @@ -586,24 +583,16 @@ class _AndroidDevicePortForwarder extends DevicePortForwarder { hostPort = await findAvailablePort(); } - runCheckedSync( - [ - androidSdk.adbPath, - 'forward', - 'tcp:$hostPort', - 'tcp:$devicePort', - ]); + runCheckedSync(device.adbCommandForDevice( + ['forward', 'tcp:$hostPort', 'tcp:$devicePort'] + )); return hostPort; } Future unforward(ForwardedPort forwardedPort) async { - runCheckedSync( - [ - androidSdk.adbPath, - 'forward', - '--remove', - 'tcp:${forwardedPort.hostPort}' - ]); + runCheckedSync(device.adbCommandForDevice( + ['forward', '--remove', 'tcp:${forwardedPort.hostPort}'] + )); } }