From ce9111b5911c3034b55be904e2bc2435fa7d261a Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Sat, 12 Mar 2016 10:41:34 -0800
Subject: [PATCH] fix a regression in adb forward

---
 .../lib/src/android/android_device.dart       | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

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<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}']
+    ));
   }
 }