diff options
| author | Josh Gao <jmgao@google.com> | 2017-08-21 23:41:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-21 23:41:53 +0000 |
| commit | 46244a6497ac6b0b1a589e40a67d0f99f462ba1e (patch) | |
| tree | 05e3d65a0b069f961facdb9e4fe664c911a9fa14 /adb/commandline.h | |
| parent | 9a1e060dc6fc2be5b661ced7571b2f291a0a1507 (diff) | |
| parent | 2066e0585e9d3758a556a1c9d040ab86cf63ec2e (diff) | |
| download | system_core-46244a6497ac6b0b1a589e40a67d0f99f462ba1e.tar.gz system_core-46244a6497ac6b0b1a589e40a67d0f99f462ba1e.tar.bz2 system_core-46244a6497ac6b0b1a589e40a67d0f99f462ba1e.zip | |
Merge changes I2270cc0a,I55e5dc5a
am: 2066e0585e
Change-Id: I72f3a3272bcce4f0e4f24050e5035810be040ec9
Diffstat (limited to 'adb/commandline.h')
| -rw-r--r-- | adb/commandline.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/commandline.h b/adb/commandline.h index 9ba69a396..36cd79841 100644 --- a/adb/commandline.h +++ b/adb/commandline.h @@ -91,8 +91,8 @@ int adb_commandline(int argc, const char** argv); // Connects to the device "shell" service with |command| and prints the // resulting output. // if |callback| is non-null, stdout/stderr output will be handled by it. -int send_shell_command(TransportType transport_type, const char* serial, const std::string& command, - bool disable_shell_protocol, StandardStreamsCallbackInterface* callback = - &DEFAULT_STANDARD_STREAMS_CALLBACK); +int send_shell_command( + const std::string& command, bool disable_shell_protocol, + StandardStreamsCallbackInterface* callback = &DEFAULT_STANDARD_STREAMS_CALLBACK); #endif // COMMANDLINE_H |