summaryrefslogtreecommitdiffstats
path: root/adb/adb.h
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-06-02 16:54:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-02 16:54:23 +0000
commitb81708146f51afb434739374095161ab7ff32787 (patch)
tree637df0e4cfaf0d368a4372af4daf75cd103458c9 /adb/adb.h
parentab1816a6c0dad525b2f26188bed96d1da6df293b (diff)
parent5d9d434efadf1c535c7fea634d5306e18c68ef1f (diff)
downloadsystem_core-b81708146f51afb434739374095161ab7ff32787.tar.gz
system_core-b81708146f51afb434739374095161ab7ff32787.tar.bz2
system_core-b81708146f51afb434739374095161ab7ff32787.zip
Merge "Add "exec" service: shell commands with no pty."
Diffstat (limited to 'adb/adb.h')
-rw-r--r--adb/adb.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/adb/adb.h b/adb/adb.h
index 2504f9926..4704abbb6 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -326,11 +326,6 @@ int create_jdwp_connection_fd(int jdwp_pid);
int handle_forward_request(const char* service, transport_type ttype, char* serial, int reply_fd);
#if !ADB_HOST
-typedef enum {
- BACKUP,
- RESTORE
-} BackupOperation;
-int backup_service(BackupOperation operation, char* args);
void framebuffer_service(int fd, void *cookie);
void remount_service(int fd, void *cookie);
#endif
@@ -418,7 +413,7 @@ void adb_qemu_trace(const char* fmt, ...);
# define D(...) ((void)0)
# define DR(...) ((void)0)
# define ADB_TRACING 0
-#endif
+#endif /* ADB_TRACE */
#if !DEBUG_PACKETS
@@ -476,6 +471,11 @@ int connection_state(atransport *t);
extern int HOST;
extern int SHELL_EXIT_NOTIFY_FD;
+typedef enum {
+ SUBPROC_PTY = 0,
+ SUBPROC_RAW = 1,
+} subproc_mode;
+
#define CHUNK_SIZE (64*1024)
#if !ADB_HOST