diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-22 01:27:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-22 01:27:36 +0000 |
| commit | 99355ffbdf1bdd097ee1e484d61b1dbb8596276e (patch) | |
| tree | 7539d9a153b2009f9f799e92f27e39354df797e5 | |
| parent | 14000a3a35d42815a95dce63b40f71e5a6cb9128 (diff) | |
| parent | 0fb33b3c05a0c935e17ae93dbe474f816cec666b (diff) | |
| download | system_core-99355ffbdf1bdd097ee1e484d61b1dbb8596276e.zip system_core-99355ffbdf1bdd097ee1e484d61b1dbb8596276e.tar.gz system_core-99355ffbdf1bdd097ee1e484d61b1dbb8596276e.tar.bz2 | |
am 0fb33b3c: Merge "Plumb more of the error reporting through."
* commit '0fb33b3c05a0c935e17ae93dbe474f816cec666b':
Plumb more of the error reporting through.
| -rw-r--r-- | adb/commandline.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/adb/commandline.cpp b/adb/commandline.cpp index 58e1ade..e76c341 100644 --- a/adb/commandline.cpp +++ b/adb/commandline.cpp @@ -764,8 +764,7 @@ static int logcat(transport_type transport, const char* serial, int argc, const cmd += " " + escape_arg(*argv++); } - send_shell_command(transport, serial, cmd); - return 0; + return send_shell_command(transport, serial, cmd); } static int mkdirs(const char *path) @@ -1603,8 +1602,7 @@ static int pm_command(transport_type transport, const char* serial, cmd += " " + escape_arg(*argv++); } - send_shell_command(transport, serial, cmd); - return 0; + return send_shell_command(transport, serial, cmd); } static int uninstall_app(transport_type transport, const char* serial, int argc, @@ -1629,8 +1627,7 @@ static int uninstall_app(transport_type transport, const char* serial, int argc, static int delete_file(transport_type transport, const char* serial, char* filename) { std::string cmd = "shell:rm -f " + escape_arg(filename); - send_shell_command(transport, serial, cmd); - return 0; + return send_shell_command(transport, serial, cmd); } static const char* get_basename(const char* filename) @@ -1691,7 +1688,7 @@ static int install_app(transport_type transport, const char* serial, int argc, argv[last_apk] = apk_dest; /* destination name, not source location */ } - pm_command(transport, serial, argc, argv); + err = pm_command(transport, serial, argc, argv); cleanup_apk: delete_file(transport, serial, apk_dest); |