commit 6ef54a56b37d1d7af927acf87a6d188aa972f12a
author herbertxue <herbertxue@google.com> Thu May 02 11:38:58 2019 +0800
committer herbertxue <herbertxue@google.com> Tue May 21 22:20:03 2019 +0800
tree 8e948afc132d944ddab429eee86e35e4d45eceb6
parent 44bb5fffc96f5f1a9f9711479b8ebc4587ca4eb4

Creating a AVD with the specified adb port.

Bug: 123721329
Test: acloud create --adb-port 3333
      acloud create --avd-type cheeps --branch git_qt-arc-dev --build-id 5539267 \
      --build-target cheets_x86-userdebug --adb-port 3333
      acloud-dev create --avd-type goldfish --build-target sdk_gphone_x86_64-userdebug \
      --branch git_master --build-id 5307677 --adb-port 3333

Change-Id: Ia6ad88b10f8fd4285cef2db0494fb300037c9826

public/device_driver.py

diff --git a/public/device_driver.py b/public/device_driver.py
index a678c02..7eecd11 100755
--- a/public/device_driver.py
+++ b/public/device_driver.py
@@ -158,6 +158,7 @@
                                         disk_image_id)
         return image_name
 
+    # pylint: disable=too-many-locals
     def CreateDevices(self,
                       num,
                       build_target=None,
@@ -403,11 +404,8 @@
             }
             if autoconnect:
                 forwarded_ports = utils.AutoConnect(
-                    ip,
-                    cfg.ssh_private_key_path,
-                    constants.GCE_VNC_PORT,
-                    constants.GCE_ADB_PORT,
-                    _SSH_USER)
+                    ip, cfg.ssh_private_key_path, constants.GCE_VNC_PORT,
+                    constants.GCE_ADB_PORT, _SSH_USER, avd_spec.adb_port)
                 device_dict[constants.VNC_PORT] = forwarded_ports.vnc_port
                 device_dict[constants.ADB_PORT] = forwarded_ports.adb_port
             if device.instance_name in failures: