ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove dead code."

Browse source 
am: 3bde05d928

Change-Id: Ib748fef3e54687c2da1818a7cd738f31e30b79ac
This commit is contained in:
Elliott Hughes 2016-11-17 20:39:22 +00:00 • committed by android-build-merger
commit 8e5fb5a0e7
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
adb/shell_service.cpp
View file

@ -106,20 +106,6 @@
namespace { namespace {
void init_subproc_child()
{
setsid();
// Set OOM score adjustment to prevent killing
int fd = adb_open("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
if (fd >= 0) {
adb_write(fd, "0", 1);
adb_close(fd);
} else {
D("adb: unable to update oom_score_adj");
}
}
// Reads from |fd| until close or failure. // Reads from |fd| until close or failure.
std::string ReadAll(int fd) { std::string ReadAll(int fd) {
char buffer[512]; char buffer[512];
@ -316,7 +302,7 @@ bool Subprocess::ForkAndExec(std::string* error) {
if (pid_ == 0) { if (pid_ == 0) {
// Subprocess child. // Subprocess child.
init_subproc_child(); setsid();
if (type_ == SubprocessType::kPty) { if (type_ == SubprocessType::kPty) {
child_stdinout_sfd.reset(OpenPtyChildFd(pts_name, &child_error_sfd)); child_stdinout_sfd.reset(OpenPtyChildFd(pts_name, &child_error_sfd));