From dc22c3c7a82ad1919c52dc4d00c601ad7210c61b Mon Sep 17 00:00:00 2001 From: Simon Ye Date: Mon, 14 Jul 2014 17:23:06 -0700 Subject: 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. Change-Id: Id4b72a051ff04104659925e63a02eb340db2f807 --- adb/adb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adb/adb.c b/adb/adb.c index 90bdbaa..d34abe7 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; } -- cgit v1.1