summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-06 00:18:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-05 00:30:25 +0000
commita8d0c4a2b8f99dd3dba9d726bdecde98d350da50 (patch)
tree78c7123108ad8fcd46a285dd3d6fcf52717eeffa
parent93266ed1f71a88af5ce5010235dfb9afbe43b289 (diff)
parentdc22c3c7a82ad1919c52dc4d00c601ad7210c61b (diff)
downloadsystem_core-a8d0c4a2b8f99dd3dba9d726bdecde98d350da50.zip
system_core-a8d0c4a2b8f99dd3dba9d726bdecde98d350da50.tar.gz
system_core-a8d0c4a2b8f99dd3dba9d726bdecde98d350da50.tar.bz2
Merge "Move host 'get-state' service up so that it works."
-rw-r--r--adb/adb.c10
1 files changed, 5 insertions, 5 deletions
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 @@ 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;
}