commit 03468c8c509975f2f410b402b2bc211b42aa0ed9
author Yabin Cui <yabinc@google.com> Tue Apr 05 13:50:44 2016 -0700
committer Josh Gao <jmgao@google.com> Mon Apr 18 15:46:25 2016 -0700
tree ee6e1e86180a4db8cd12524928eaf6a9c4ec5a04
parent b046e74beff221d96189c4142f42f18730565921

adb: add reconnect command.

Add reconnect command for debugging. `reconnect` kicks a transport
from the host side, `reconnect device` kicks a transport from
the device side. They can be used to produce transport errors.

Bug: 25935458

Change-Id: I47daa338796b561941e7aba44a51a6dd117d1e98
(cherry picked from commit 1f4ec19e499ba981e4117f647d191603c2713e79)

adb/adb_client.cpp

diff --git a/adb/adb_client.cpp b/adb/adb_client.cpp
index db9b710..7412587 100644
--- a/adb/adb_client.cpp
+++ b/adb/adb_client.cpp
@@ -149,7 +149,8 @@
         }
     }
 
-    if (memcmp(&service[0],"host",4) != 0 && switch_socket_transport(fd, error)) {
+    if ((memcmp(&service[0],"host",4) != 0 || service == "host:reconnect") &&
+        switch_socket_transport(fd, error)) {
         return -1;
     }
 
@@ -159,9 +160,11 @@
         return -1;
     }
 
-    if (!adb_status(fd, error)) {
-        adb_close(fd);
-        return -1;
+    if (service != "reconnect") {
+        if (!adb_status(fd, error)) {
+            adb_close(fd);
+            return -1;
+        }
     }
 
     D("_adb_connect: return fd %d", fd);