commit a8d0c4a2b8f99dd3dba9d726bdecde98d350da50
author Elliott Hughes <enh@google.com> Wed Aug 06 00:18:10 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 05 00:30:25 2014 +0000
tree 78c7123108ad8fcd46a285dd3d6fcf52717eeffa
parent 93266ed1f71a88af5ce5010235dfb9afbe43b289
parent dc22c3c7a82ad1919c52dc4d00c601ad7210c61b

Merge "Move host 'get-state' service up so that it works."

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 2c7793d..10a1e0d 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -1670,11 +1670,6 @@
         /* we don't even need to send a reply */
         return 0;
     }
-#endif // ADB_HOST
-
-    int ret = handle_forward_request(service, ttype, serial, reply_fd);
-    if (ret >= 0)
-      return ret - 1;
 
     if(!strncmp(service,"get-state",strlen("get-state"))) {
         transport = acquire_one_transport(CS_ANY, ttype, serial, NULL);
@@ -1682,6 +1677,11 @@
         send_msg_with_okay(reply_fd, state, strlen(state));
         return 0;
     }
+#endif // ADB_HOST
+
+    int ret = handle_forward_request(service, ttype, serial, reply_fd);
+    if (ret >= 0)
+      return ret - 1;
     return -1;
 }