tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 99355ffb: am 0fb33b3c: Merge "Plumb more of the error reporting through."

Browse source 
* commit '99355ffbdf1bdd097ee1e484d61b1dbb8596276e':
  Plumb more of the error reporting through.
This commit is contained in:
Elliott Hughes 2015-04-22 01:39:56 +00:00 committed by Android Git Automerger
commit c8ecbc8aa8
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
adb/commandline.cpp
View file

@ -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);