From d9c4b14b44e93006efdffb059b769d46af509e2d Mon Sep 17 00:00:00 2001
From: Simon Ye <sye@google.com>
Date: Mon, 14 Jul 2014 17:23:06 -0700
Subject: [PATCH] Move host 'get-state' service up so that it works.

Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

(cherry picked from commit dc22c3c7a82ad1919c52dc4d00c601ad7210c61b)

Change-Id: I08465e7c666104a4c2d15eadef8a4d4be7f91456
---
 adb/adb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adb/adb.c b/adb/adb.c
index 2c7793d6c..10a1e0da2 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -1670,11 +1670,6 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r
         /* 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 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r
         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;
 }