Support for Android adb connect to the given device

1 files changed, 8 insertions, 11 deletions

diff --git a/scripts/Util.py b/scripts/Util.py
index 3288d3d5129..d866a4b2b38 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -2253,12 +2253,7 @@ class AndroidProcessController(RemoteProcessController):
             return "Android/ProcessController"
 
     def adb(self):
-        if self.device == "usb":
-            return "adb -d"
-        elif self.device:
-            return "adb -s {}".format(self.device)
-        else:
-            return "adb"
+        return "adb -d" if self.device == "usb" else "adb"
 
     def startEmulator(self, avd):
         #
@@ -2328,6 +2323,8 @@ class AndroidProcessController(RemoteProcessController):
             #run("sdkmanager \"{0}\"".format(sdk), stdout=True, stdin="yes", stdinRepeat=True) # yes to accept licenses
             run("avdmanager create avd -k \"{0}\" -d \"Nexus 6\" -n IceTests".format(sdk))
             self.startEmulator("IceTests")
+        elif current.config.device != "usb":
+            run("adb connect {}".format(current.config.device))
 
         run("{} install -t -r {}".format(self.adb(), current.testcase.getMapping().getApk(current)))
         run("{} shell am start -n \"{}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER".format(
@@ -2345,11 +2342,6 @@ class AndroidProcessController(RemoteProcessController):
             except:
                 pass
 
-            try:
-                run("adb kill-server")
-            except:
-                pass
-
             if self.avd == "IceTests":
                 try:
                     run("avdmanager delete avd -n IceTests") # Delete the created device
@@ -2370,6 +2362,11 @@ class AndroidProcessController(RemoteProcessController):
                 sys.stdout.flush()
                 time.sleep(0.5)
 
+        try:
+            run("adb kill-server")
+        except:
+            pass
+
 class iOSSimulatorProcessController(RemoteProcessController):
 
     device = "iOSSimulatorProcessController"